ascript 1.2.8__tar.gz → 1.3.0__tar.gz

{ascript-1.2.8 → ascript-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.2.8
+Version: 1.3.0
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows
@@ -27,6 +27,7 @@ Requires-Dist: uiautomation>=2.0.20
 Requires-Dist: pywin32>=306
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pyautogui>=0.9.54
+Requires-Dist: pydirectinput>=0.1.1
 Requires-Dist: opencv-python>=4.9.0.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: numpy>=1.26.0

ascript-1.3.0/ascript/windows/hardware/logitech_driver.py

@@ -0,0 +1,126 @@
+import ctypes
+import time
+import sys
+import os
+from ..system import R
+
+
+class LogitechDriver:
+    DLL_NAME = "LogitechGkeyEnginesWrapper.dll"
+
+    _dll = None
+    _initialized = False
+
+    @classmethod
+    def _get_dll_path(cls):
+        """根据 Python 位数精准定位 DLL 路径"""
+        arch = "x64" if sys.maxsize > 2 ** 32 else "x86"
+        return R.internal("windows", "resources", "libs", "logitech", arch, cls.DLL_NAME)
+
+    @classmethod
+    def _is_ghub_running(cls) -> bool:
+        """多重检测 G HUB 是否在运行"""
+        try:
+            # 罗技 G HUB 可能存在于这三个进程中
+            targets = {"lghub.exe", "lghub_agent.exe", "lghub_updater.exe"}
+            with os.popen('tasklist /NH /FI "STATUS eq running"') as f:
+                output = f.read().lower()
+            return any(t in output for t in targets)
+        except:
+            return False
+
+    @classmethod
+    def init(cls) -> bool:
+        """
+        深度初始化逻辑
+        """
+        if cls._initialized:
+            return True
+
+        # 1. 环境检查
+        if not cls._is_ghub_running():
+            print("[LogitechDriver] 错误: 未检测到 G HUB 进程，请确保罗技驱动已启动。")
+            return False
+
+        dll_path = cls._get_dll_path()
+        if not os.path.exists(dll_path):
+            print(f"[LogitechDriver] 错误: 找不到 DLL -> {dll_path}")
+            return False
+
+        try:
+            # 2. 加载 DLL 并强制使用 Windows 路径标准
+            cls._dll = ctypes.CDLL(dll_path)
+
+            # 3. 尝试所有可能的初始化导出函数
+            # 罗技 SDK 随版本变化，函数名可能为以下其一
+            init_functions = [
+                "LogiGkeyInitWithoutContext",
+                "LogiGkeyInit",
+                "LogiGkeyInitWithoutScene"
+            ]
+
+            success = False
+            for func_name in init_functions:
+                if hasattr(cls._dll, func_name):
+                    if getattr(cls._dll, func_name)():
+                        success = True
+                        break
+
+            if success:
+                # [关键] 驱动初始化后必须等待，否则紧随其后的指令会丢失
+                time.sleep(0.5)
+                cls._initialized = True
+                return True
+
+            return False
+        except Exception as e:
+            print(f"[LogitechDriver] 加载异常: {e}")
+            return False
+
+    @classmethod
+    def advanced_click_guide(cls):
+        """高级引导：检查权限与环境"""
+        print("--- [Logitech] 底层引擎自检 ---")
+
+        # 管理员权限检查
+        try:
+            is_admin = ctypes.windll.shell32.IsUserAnAdmin() != 0
+        except:
+            is_admin = False
+
+        if not is_admin:
+            print("⚠️ 注意: 当前非管理员权限，这可能是点击无效的主因！")
+
+        if cls.init():
+            print("✅ 驱动模式已激活。")
+            return True
+        else:
+            print("❌ 驱动激活失败，请检查 G HUB 是否正常运行。")
+            return False
+
+    @classmethod
+    def click(cls, button: int = 1, duration: float = 0.05):
+        """
+        驱动级点击
+        :param button: 1=左键, 2=中键, 4=右键 (注意：SDK 中右键通常是 4)
+        """
+        if not cls.init():
+            return False
+        try:
+            cls._dll.LogiMouseButtonPressed(button)
+            time.sleep(duration)
+            cls._dll.LogiMouseButtonReleased(button)
+            return True
+        except:
+            return False
+
+    @classmethod
+    def move_rel(cls, x: int, y: int):
+        """相对移动"""
+        if not cls.init():
+            return False
+        try:
+            # 罗技相对移动
+            return cls._dll.LogiMouseRelativeMove(int(x), int(y))
+        except:
+            return False

ascript-1.3.0/ascript/windows/hardware/mouse.py

@@ -0,0 +1,112 @@
+import time
+import random
+import pydirectinput
+from ctypes import windll
+from typing import Optional
+
+# 启用 DPI 感知
+try:
+    windll.shcore.SetProcessDpiAwareness(1)
+except:
+    try:
+        windll.user32.SetProcessDPIAware()
+    except:
+        pass
+
+
+class Mouse:
+    """
+    基于 PyDirectInput 优化的鼠标控制类。
+    """
+
+    # 基础按键定义
+    LEFT = "left"
+    MIDDLE = "middle"
+    RIGHT = "right"
+
+    # 全局配置
+    pydirectinput.FAILSAFE = True
+    DEFAULT_MOVE_DURATION = 0.1
+
+    @classmethod
+    def mouse_move(cls, x: int, y: int, move_duration: float = DEFAULT_MOVE_DURATION):
+        """移动鼠标到指定位置"""
+        pydirectinput.moveTo(x=x, y=y, duration=move_duration)
+        return cls
+
+    @classmethod
+    def mouse_down(cls, x: int = None, y: int = None, button: str = LEFT):
+        """按下鼠标按键"""
+        pydirectinput.mouseDown(x=x, y=y, button=button)
+        return cls
+
+    @classmethod
+    def mouse_up(cls, x: int = None, y: int = None, button: str = LEFT):
+        """松开鼠标按键"""
+        pydirectinput.mouseUp(x=x, y=y, button=button)
+        return cls
+
+    @classmethod
+    def click(cls,
+              x: Optional[int] = None,
+              y: Optional[int] = None,
+              clicks: int = 1,
+              interval: float = 0.1,
+              button: str = LEFT,
+              move_duration: float = 0.0,
+              duration: float = 0.05,
+              offset: int = 0):
+        """
+        模拟鼠标点击。
+        :param duration: 按下与弹起之间的物理间隔，增加此值可提高模拟点击的成功率。
+        """
+        target_x, target_y = x, y
+
+        if offset > 0 and x is not None and y is not None:
+            target_x = max(0, x + random.randint(-offset, offset))
+            target_y = max(0, y + random.randint(-offset, offset))
+
+        if target_x is not None and target_y is not None:
+            cls.mouse_move(target_x, target_y, move_duration=move_duration)
+
+        for i in range(clicks):
+            cls.mouse_down(button=button)
+            time.sleep(max(0.01, duration))
+            cls.mouse_up(button=button)
+            if i < clicks - 1:
+                time.sleep(interval)
+        return cls
+
+    @classmethod
+    def long_press(cls, x: int = None, y: int = None, press_duration: float = 2.0, button: str = LEFT):
+        """模拟长按逻辑"""
+        if x is not None and y is not None:
+            cls.mouse_move(x, y, move_duration=0.0)
+
+        cls.mouse_down(button=button)
+        time.sleep(press_duration)
+        cls.mouse_up(button=button)
+        return cls
+
+    @classmethod
+    def scroll(cls, clicks: int, x: int = None, y: int = None):
+        """模拟滚动"""
+        if x is not None and y is not None:
+            cls.mouse_move(x, y, move_duration=0.0)
+        pydirectinput.scroll(clicks)
+        return cls
+
+    @classmethod
+    def drag(cls, to_x: int, to_y: int, from_x: int = None, from_y: int = None, move_duration: float = 0.5):
+        """从指定位置拖拽到目标位置"""
+        if from_x is not None and from_y is not None:
+            cls.mouse_move(from_x, from_y, move_duration=0.0)
+
+        pydirectinput.dragTo(to_x, to_y, duration=move_duration, button=cls.LEFT)
+        return cls
+
+    @classmethod
+    def wait(cls, seconds: float):
+        """链式调用中的逻辑等待"""
+        time.sleep(seconds)
+        return cls

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/screen/__init__.py

@@ -1,4 +1,3 @@
-
 from .screen_core import Screen
 from .find_images import FindImages
 from .find_colors import FindColors

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/screen/ocr/rapidocr_hook.py

@@ -160,7 +160,7 @@ class RapidOCRHook(importlib.abc.MetaPathFinder):
             if not hasattr(cls, "find"):
                 cls.find = find
                 cls.find_all = find_all
-                print(f"✅ [RapidOCR-Hook] 成功注入 find/find_all 扩展")
+                # print(f"✅ [RapidOCR-Hook] 成功注入 find/find_all 扩展")
 
 
 def install():

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/screen/screen_core.py

@@ -80,7 +80,6 @@ class Screen:
                 if format.startswith("base64"):
                     # 默认 jpeg，除非明确指定 base64:png
                     sub_format = "PNG" if (":" in format and format.split(":")[1].lower() == "png") else "JPEG"
-
                     buffered = BytesIO()
                     img.save(buffered, format=sub_format, quality=80 if sub_format == "JPEG" else None)
                     img_str = base64.b64encode(buffered.getvalue()).decode("utf-8")

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/system/r.py

@@ -2,6 +2,8 @@ import sys
 import os
 from pathlib import Path
 import ascript  # 必须导入你的包以定位其物理位置
+import sys
+import ctypes
 
 class R:
     _BASE_DIR = None
@@ -76,4 +78,21 @@ class R:
                 return str(bundle_path)
 
         # B. 开发环境或兜底 (寻找 site-packages/ascript/xxx)
-        return cls._build_path(cls._PKG_ROOT, *sub_paths)
+        return cls._build_path(cls._PKG_ROOT, *sub_paths)
+
+    @classmethod
+    def is_admin(cls):
+        try:
+            return ctypes.windll.shell32.IsUserAnAdmin()
+        except:
+            return False
+
+    @classmethod
+    def run_as_admin(cls):
+        """如果不是管理员，自动重启并请求管理员权限"""
+        if not cls.is_admin():
+            # ShellExecuteEx 会触发系统 UAC 弹窗
+            ctypes.windll.shell32.ShellExecuteW(
+                None, "runas", sys.executable, " ".join(sys.argv), None, 1
+            )
+            sys.exit()

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/tools/colors_tool.py

@@ -241,8 +241,7 @@ def start_colors(hwnd:str = None,window_title:str = None):
     # 获取一个临时的绝对路径作为用户数据目录
     data_dir = os.path.join(os.getcwd(), 'chrome_debug_profile')
 
-    eel_kwargs = {
-        'mode': 'chrome',
+    eel_kwargs_base = {
         'port': 0,
         'cmdline_args': [
             '--start-maximized',
@@ -255,16 +254,20 @@ def start_colors(hwnd:str = None,window_title:str = None):
     }
 
     print("正在启动 图形处理 工具...")
-    try:
-        # 这一行搞定：如果有 hwnd 则拼接参数，否则为空字符串
-        url = f"colors.html?hwnd={hwnd}" if hwnd else "colors.html"
-        # 启动线程
-        threading.Thread(target=listen_win32_hotkey, daemon=True).start()
-        eel.start(url, **eel_kwargs)
-
-        # eel.start('index.html', mode='chrome', cmdline_args=['--disable-web-security', '--user-data-dir=remote-debug'])
+    url = f"colors.html?hwnd={hwnd}" if hwnd else "colors.html"
+    threading.Thread(target=listen_win32_hotkey, daemon=True).start()
 
+    try:
+        for mode in ('chrome', 'edge', 'edgechromium'):
+            try:
+                eel.start(url, mode=mode, **eel_kwargs_base)
+                break
+            except OSError as e:
+                if 'find' in str(e).lower() and 'installation' in str(e).lower():
+                    continue
+                raise
+        else:
+            print("错误：未检测到可用浏览器。请安装 Chrome 或 Edge 浏览器。")
     except (SystemExit, MemoryError, KeyboardInterrupt):
-        # 正常退出
         pass
 

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/tools/dumptool.py

@@ -23,14 +23,23 @@ def start_vtree(hwnd: str = None, window_title: str = None):
 
     eel.init(web_folder)
 
-    eel_kwargs = {
-        'mode': 'chrome',
+    eel_kwargs_base = {
         'port': 0,
         'cmdline_args': ['--start-maximized', '--incognito']
     }
 
+    url = f"vtree.html?hwnd={hwnd}" if hwnd else "vtree.html"
+
     try:
-        url = f"vtree.html?hwnd={hwnd}" if hwnd else "vtree.html"
-        eel.start(url, **eel_kwargs)
+        for mode in ('chrome', 'edge', 'edgechromium'):
+            try:
+                eel.start(url, mode=mode, **eel_kwargs_base)
+                break
+            except OSError as e:
+                if 'find' in str(e).lower() and 'installation' in str(e).lower():
+                    continue
+                raise
+        else:
+            print("错误：未检测到可用浏览器。请安装 Chrome 或 Edge 浏览器。")
     except (SystemExit, MemoryError, KeyboardInterrupt):
         pass

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/ui/web_window.py

@@ -1,4 +1,4 @@
-import time
+import threading
 
 import webview
 import os
@@ -17,7 +17,7 @@ class WebWindow:
         self._exposed_functions[func.__name__] = func
         return func
 
-    def show(self, title: str = "AScript Window", debug=False, **kwargs):
+    def show(self, title: str = "AScript Window", debug=False, block: bool = True, **kwargs):
         class ApiBridge:
             def __init__(self, funcs): self._funcs = funcs
             def call_internal(self, func_name, args):
@@ -53,9 +53,15 @@ class WebWindow:
             # print("end", time.time())
 
         # 启动并绑定加载完成事件
-        webview.start(on_loaded, debug=debug)
-        # 窗口关闭后，返回存储的结果
-        return self._return_value
+        if block:
+            webview.start(on_loaded, debug=debug)
+            return self._return_value
+        else:
+            def _run():
+                webview.start(on_loaded, debug=debug)
+
+            t = threading.Thread(target=_run, daemon=True)
+            t.start()
 
     def close(self):
         if self.webview_instance:

{ascript-1.2.8 → ascript-1.3.0}/ascript/windows/window/Window.py

@@ -23,7 +23,6 @@ try:
 except:
     windll.user32.SetProcessDPIAware()
 
-
 # 1. 定义独立的结构类
 class WindowRect(NamedTuple):
     """窗口空间位置信息 (不占内存，支持补全)"""
@@ -220,8 +219,26 @@ class Window:
     # --- 状态属性 ---
     @property
     def is_visible(self):
-        """窗口是否可见"""
-        return win32gui.IsWindowVisible(self.hwnd)
+        # 1. 基础检查：系统必须认为它是可见的
+        if not win32gui.IsWindowVisible(self.hwnd):
+            return False
+
+        # 2. 面积检查：宽高必须大于 0
+        left, top, right, bottom = win32gui.GetWindowRect(self.hwnd)
+        width = right - left
+        height = bottom - top
+        if width <= 0 or height <= 0:
+            return False
+
+        # 3. 坐标检查：不能在极远的“异次元”坐标（有些库会把隐藏窗口丢到 -32000）
+        if left < -30000 or top < -30000:
+            return False
+
+        # 4. 标题检查（可选）：如果标题变空了，可能窗口正在销毁中
+        if not win32gui.GetWindowText(self.hwnd):
+            return False
+
+        return True
 
     @property
     def is_minimized(self):
@@ -231,12 +248,36 @@ class Window:
     @property
     def is_maximized(self):
         """是否最大化"""
-        return win32gui.IsZoomed(self.hwnd) != 0
+        tup = win32gui.GetWindowPlacement(self.hwnd)
+        return tup[1] == win32con.SW_SHOWMAXIMIZED
 
     @property
     def is_responding(self):
         """窗口是否响应（未卡死）"""
-        return windll.user32.IsHungAppWindow(self.hwnd) == 0
+        # 显式获取函数对象，避免属性查找错误
+        is_hung = getattr(windll.user32, "IsHungAppWindow", None)
+        if is_hung:
+            return is_hung(self.hwnd) == 0
+
+        # 如果还是找不到，回退到方案二
+        return self._check_responding_via_timeout()
+
+    @property
+    def _check_responding_via_timeout(self):
+        try:
+            # SMTO_ABORTIFHUNG: 如果窗口已卡死，直接返回
+            # 100 是超时时间（毫秒）
+            res = win32gui.SendMessageTimeout(
+                self.hwnd,
+                win32con.WM_NULL,
+                0, 0,
+                win32con.SMTO_ABORTIFHUNG | win32con.SMTO_BLOCK,
+                100
+            )
+            # 如果返回值为 0，通常表示超时或失败
+            return res[0] != 0
+        except:
+            return False
 
     @property
     def is_always_on_top(self):

{ascript-1.2.8 → ascript-1.3.0}/ascript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.2.8
+Version: 1.3.0
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows
@@ -27,6 +27,7 @@ Requires-Dist: uiautomation>=2.0.20
 Requires-Dist: pywin32>=306
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pyautogui>=0.9.54
+Requires-Dist: pydirectinput>=0.1.1
 Requires-Dist: opencv-python>=4.9.0.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: numpy>=1.26.0

{ascript-1.2.8 → ascript-1.3.0}/ascript.egg-info/SOURCES.txt

@@ -77,6 +77,7 @@ ascript/windows/daos/__init__.py
 ascript/windows/daos/screen.py
 ascript/windows/hardware/__init__.py
 ascript/windows/hardware/keyboard.py
+ascript/windows/hardware/logitech_driver.py
 ascript/windows/hardware/mouse.py
 ascript/windows/license/__init__.py
 ascript/windows/license/achttp.cp310-win_amd64.pyd
@@ -88,6 +89,8 @@ ascript/windows/license/achttp.cp38-win_amd64.pyd
 ascript/windows/license/achttp.cp39-win_amd64.pyd
 ascript/windows/media/__init__.py
 ascript/windows/resources/__init__.py
+ascript/windows/resources/libs/logitech/x64/LogitechGkeyEnginesWrapper.dll
+ascript/windows/resources/libs/logitech/x86/LogitechGkeyEnginesWrapper.dll
 ascript/windows/resources/templates/__init__.py
 ascript/windows/resources/templates/__init__py.win.template
 ascript/windows/resources/templates/build.as.win.template

{ascript-1.2.8 → ascript-1.3.0}/ascript.egg-info/requires.txt

@@ -9,6 +9,7 @@ uiautomation>=2.0.20
 pywin32>=306
 psutil>=5.9.0
 pyautogui>=0.9.54
+pydirectinput>=0.1.1
 opencv-python>=4.9.0.0
 pillow>=10.0.0
 numpy>=1.26.0

{ascript-1.2.8 → ascript-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ascript"
-version = "1.2.8"
+version = "1.3.0"
 description = "Ascript Developer Library"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -44,6 +44,7 @@ dependencies = [
     "pywin32>=306",
     "psutil>=5.9.0",
     "pyautogui>=0.9.54",
+    "pydirectinput >= 0.1.1",
     "opencv-python>=4.9.0.0",
     "pillow>=10.0.0",
     "numpy>=1.26.0",