kotonebot 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

kotonebot/client/host/protocol.py

@@ -1,214 +1,214 @@
-import time
-import socket
-from abc import ABC, abstractmethod
-from typing import Callable, TypeVar, Protocol, Any, Generic
-from dataclasses import dataclass
-
-from kotonebot import logging
-from kotonebot.client import Device, DeviceImpl
-
-from kotonebot.util import Countdown, Interval
-
-logger = logging.getLogger(__name__)
-# https://github.com/python/typing/issues/769#issuecomment-903760354
-_T = TypeVar("_T")
-def copy_type(_: _T) -> Callable[[Any], _T]:
-    return lambda x: x
-
-# --- 定义专用的 HostConfig 数据类 ---
-@dataclass
-class AdbHostConfig:
-    """由外部为基于 ADB 的主机提供的配置。"""
-    timeout: float = 180
-
-@dataclass
-class WindowsHostConfig:
-    """由外部为 Windows 实现提供配置。"""
-    window_title: str
-    ahk_exe_path: str
-
-@dataclass
-class RemoteWindowsHostConfig:
-    """由外部为远程 Windows 实现提供配置。"""
-    windows_host_config: WindowsHostConfig
-    host: str
-    port: int
-
-# --- 使用泛型改造 Instance 协议 ---
-T_HostConfig = TypeVar("T_HostConfig")
-
-def tcp_ping(host: str, port: int, timeout: float = 1.0) -> bool:
-    """
-    通过 TCP ping 检查主机和端口是否可达。
-    
-    :param host: 主机名或 IP 地址
-    :param port: 端口号
-    :param timeout: 超时时间（秒）
-    :return: 如果主机和端口可达，则返回 True，否则返回 False
-    """
-    logger.debug('TCP ping %s:%d...', host, port)
-    try:
-        with socket.create_connection((host, port), timeout):
-            logger.debug('TCP ping %s:%d success.', host, port)
-            return True
-    except (socket.timeout, ConnectionRefusedError, OSError):
-        logger.debug('TCP ping %s:%d failed.', host, port)
-        return False
-
-
-class Instance(Generic[T_HostConfig], ABC):
-    """
-    代表一个可运行环境的实例（如一个模拟器）。
-    使用泛型来约束 create_device 方法的配置参数类型。
-    """
-    def __init__(self,
-        id: str,
-        name: str,
-        adb_port: int | None = None,
-        adb_ip: str = '127.0.0.1',
-        adb_name: str | None = None
-    ):
-        self.id: str = id
-        self.name: str = name
-        self.adb_port: int | None = adb_port
-        self.adb_ip: str = adb_ip
-        self.adb_name: str | None = adb_name
-
-    def require_adb_port(self) -> int:
-        if self.adb_port is None:
-            raise ValueError("ADB port is not set and is required.")
-        return self.adb_port
-
-    @abstractmethod
-    def refresh(self):
-        """
-        刷新实例信息，如 ADB 端口号等。
-        """
-        raise NotImplementedError()
-
-    @abstractmethod
-    def start(self):
-        """
-        启动模拟器实例。
-        """
-        raise NotImplementedError()
-
-    @abstractmethod
-    def stop(self):
-        """
-        停止模拟器实例。
-        """
-        raise NotImplementedError()
-
-    @abstractmethod
-    def running(self) -> bool:
-        raise NotImplementedError()
-
-    @abstractmethod
-    def create_device(self, impl: DeviceImpl, host_config: T_HostConfig) -> Device:
-        """
-        根据实现名称和类型化的主机配置创建设备。
-
-        :param impl: 设备实现的名称。
-        :param host_config: 一个类型化的数据对象，包含创建所需的所有外部配置。
-        :return: 配置好的 Device 实例。
-        """
-        raise NotImplementedError()
-
-    # TODO: [refactor] 这个方法不应该挂在 Instance，而是 AndroidEmulatorInstance 上
-    def wait_available(self, timeout: float = 180):
-        from adbutils import adb, AdbTimeout, AdbError
-        from adbutils._device import AdbDevice
-        
-        logger.info('Starting to wait for emulator %s(127.0.0.1:%d) to be available...', self.name, self.adb_port)
-        state = 0
-        port = self.require_adb_port() 
-        emulator_name = self.adb_name
-        cd = Countdown(timeout)
-        it = Interval(1)
-        d: AdbDevice | None = None
-        while True:
-            if cd.expired():
-                raise TimeoutError(f'Emulator "{self.name}" is not available.')
-            it.wait()
-            try:
-                match state:
-                    case 0:
-                        logger.debug('Ping emulator %s(127.0.0.1:%d)...', self.name, port)
-                        if tcp_ping('127.0.0.1', port):
-                            logger.debug('Ping emulator %s(127.0.0.1:%d) success.', self.name, port)
-                            state = 1
-                    case 1:
-                        logger.debug('Connecting to emulator %s(127.0.0.1:%d)...', self.name, port)
-                        if adb.connect(f'127.0.0.1:{port}', timeout=0.5):
-                            logger.debug('Connect to emulator %s(127.0.0.1:%d) success.', self.name, port)
-                            state = 2
-                    case 2:
-                        logger.debug('Getting device list...')
-                        if devices := adb.device_list():
-                            logger.debug('Get device list success. devices=%s', devices)
-                            # emulator_name 用于适配雷电模拟器
-                            # 雷电模拟器启动后，在上方的列表中并不会出现 127.0.0.1:5555，而是 emulator-5554
-                            d = next(
-                                (d for d in devices if d.serial == f'127.0.0.1:{port}' or d.serial == emulator_name),
-                                None
-                            )
-                            if d:
-                                logger.debug('Get target device success. d=%s', d)
-                                state = 3
-                    case 3:
-                        if not d:
-                            logger.warning('Device is None.')
-                            state = 0
-                            continue
-                        logger.debug('Waiting for device state...')
-                        if d.get_state() == 'device':
-                            logger.debug('Device state ready. state=%s', d.get_state())
-                            state = 4
-                    case 4:
-                        logger.debug('Waiting for device boot completed...')
-                        if not d:
-                            logger.warning('Device is None.')
-                            state = 0
-                            continue
-                        ret = d.shell('getprop sys.boot_completed')
-                        if isinstance(ret, str) and ret.strip() == '1':
-                            logger.debug('Device boot completed. ret=%s', ret)
-                            state = 5
-                    case 5:
-                        if not d:
-                            logger.warning('Device is None.')
-                            state = 0
-                            continue
-                        app = d.app_current()
-                        logger.debug('Waiting for launcher... (current=%s)', app)
-                        if app and 'launcher' in app.package:
-                            logger.info('Emulator %s(127.0.0.1:%d) now is available.', self.name, self.adb_port)
-                            state = 6
-                    case 6:
-                        break
-            except (AdbError, AdbTimeout):
-                state = 1
-                continue
-        time.sleep(1)
-        logger.info('Emulator %s(127.0.0.1:%d) now is available.', self.name, self.adb_port)
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}(name="{self.name}", id="{self.id}", adb="{self.adb_ip}:{self.adb_port}"({self.adb_name}))'
-
-Recipe = TypeVar('Recipe', bound=str)
-class HostProtocol(Generic[Recipe], Protocol):
-    @staticmethod
-    def installed() -> bool: ...
-    
-    @staticmethod
-    def list() -> list[Instance]: ...
-    
-    @staticmethod
-    def query(*, id: str) -> Instance | None: ...
-
-    @staticmethod
-    def recipes() -> 'list[Recipe]': ...
-
-if __name__ == '__main__':
-    pass
+import time
+import socket
+from abc import ABC, abstractmethod
+from typing import Callable, TypeVar, Protocol, Any, Generic
+from dataclasses import dataclass
+
+from kotonebot import logging
+from kotonebot.client import Device, DeviceImpl
+
+from kotonebot.util import Countdown, Interval
+
+logger = logging.getLogger(__name__)
+# https://github.com/python/typing/issues/769#issuecomment-903760354
+_T = TypeVar("_T")
+def copy_type(_: _T) -> Callable[[Any], _T]:
+    return lambda x: x
+
+# --- 定义专用的 HostConfig 数据类 ---
+@dataclass
+class AdbHostConfig:
+    """由外部为基于 ADB 的主机提供的配置。"""
+    timeout: float = 180
+
+@dataclass
+class WindowsHostConfig:
+    """由外部为 Windows 实现提供配置。"""
+    window_title: str
+    ahk_exe_path: str
+
+@dataclass
+class RemoteWindowsHostConfig:
+    """由外部为远程 Windows 实现提供配置。"""
+    windows_host_config: WindowsHostConfig
+    host: str
+    port: int
+
+# --- 使用泛型改造 Instance 协议 ---
+T_HostConfig = TypeVar("T_HostConfig")
+
+def tcp_ping(host: str, port: int, timeout: float = 1.0) -> bool:
+    """
+    通过 TCP ping 检查主机和端口是否可达。
+    
+    :param host: 主机名或 IP 地址
+    :param port: 端口号
+    :param timeout: 超时时间（秒）
+    :return: 如果主机和端口可达，则返回 True，否则返回 False
+    """
+    logger.debug('TCP ping %s:%d...', host, port)
+    try:
+        with socket.create_connection((host, port), timeout):
+            logger.debug('TCP ping %s:%d success.', host, port)
+            return True
+    except (socket.timeout, ConnectionRefusedError, OSError):
+        logger.debug('TCP ping %s:%d failed.', host, port)
+        return False
+
+
+class Instance(Generic[T_HostConfig], ABC):
+    """
+    代表一个可运行环境的实例（如一个模拟器）。
+    使用泛型来约束 create_device 方法的配置参数类型。
+    """
+    def __init__(self,
+        id: str,
+        name: str,
+        adb_port: int | None = None,
+        adb_ip: str = '127.0.0.1',
+        adb_name: str | None = None
+    ):
+        self.id: str = id
+        self.name: str = name
+        self.adb_port: int | None = adb_port
+        self.adb_ip: str = adb_ip
+        self.adb_name: str | None = adb_name
+
+    def require_adb_port(self) -> int:
+        if self.adb_port is None:
+            raise ValueError("ADB port is not set and is required.")
+        return self.adb_port
+
+    @abstractmethod
+    def refresh(self):
+        """
+        刷新实例信息，如 ADB 端口号等。
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
+    def start(self):
+        """
+        启动模拟器实例。
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
+    def stop(self):
+        """
+        停止模拟器实例。
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
+    def running(self) -> bool:
+        raise NotImplementedError()
+
+    @abstractmethod
+    def create_device(self, impl: DeviceImpl, host_config: T_HostConfig) -> Device:
+        """
+        根据实现名称和类型化的主机配置创建设备。
+
+        :param impl: 设备实现的名称。
+        :param host_config: 一个类型化的数据对象，包含创建所需的所有外部配置。
+        :return: 配置好的 Device 实例。
+        """
+        raise NotImplementedError()
+
+    # TODO: [refactor] 这个方法不应该挂在 Instance，而是 AndroidEmulatorInstance 上
+    def wait_available(self, timeout: float = 180):
+        from adbutils import adb, AdbTimeout, AdbError
+        from adbutils._device import AdbDevice
+        
+        logger.info('Starting to wait for emulator %s(127.0.0.1:%d) to be available...', self.name, self.adb_port)
+        state = 0
+        port = self.require_adb_port() 
+        emulator_name = self.adb_name
+        cd = Countdown(timeout)
+        it = Interval(1)
+        d: AdbDevice | None = None
+        while True:
+            if cd.expired():
+                raise TimeoutError(f'Emulator "{self.name}" is not available.')
+            it.wait()
+            try:
+                match state:
+                    case 0:
+                        logger.debug('Ping emulator %s(127.0.0.1:%d)...', self.name, port)
+                        if tcp_ping('127.0.0.1', port):
+                            logger.debug('Ping emulator %s(127.0.0.1:%d) success.', self.name, port)
+                            state = 1
+                    case 1:
+                        logger.debug('Connecting to emulator %s(127.0.0.1:%d)...', self.name, port)
+                        if adb.connect(f'127.0.0.1:{port}', timeout=0.5):
+                            logger.debug('Connect to emulator %s(127.0.0.1:%d) success.', self.name, port)
+                            state = 2
+                    case 2:
+                        logger.debug('Getting device list...')
+                        if devices := adb.device_list():
+                            logger.debug('Get device list success. devices=%s', devices)
+                            # emulator_name 用于适配雷电模拟器
+                            # 雷电模拟器启动后，在上方的列表中并不会出现 127.0.0.1:5555，而是 emulator-5554
+                            d = next(
+                                (d for d in devices if d.serial == f'127.0.0.1:{port}' or d.serial == emulator_name),
+                                None
+                            )
+                            if d:
+                                logger.debug('Get target device success. d=%s', d)
+                                state = 3
+                    case 3:
+                        if not d:
+                            logger.warning('Device is None.')
+                            state = 0
+                            continue
+                        logger.debug('Waiting for device state...')
+                        if d.get_state() == 'device':
+                            logger.debug('Device state ready. state=%s', d.get_state())
+                            state = 4
+                    case 4:
+                        logger.debug('Waiting for device boot completed...')
+                        if not d:
+                            logger.warning('Device is None.')
+                            state = 0
+                            continue
+                        ret = d.shell('getprop sys.boot_completed')
+                        if isinstance(ret, str) and ret.strip() == '1':
+                            logger.debug('Device boot completed. ret=%s', ret)
+                            state = 5
+                    case 5:
+                        if not d:
+                            logger.warning('Device is None.')
+                            state = 0
+                            continue
+                        app = d.app_current()
+                        logger.debug('Waiting for launcher... (current=%s)', app)
+                        if app and 'launcher' in app.package:
+                            logger.info('Emulator %s(127.0.0.1:%d) now is available.', self.name, self.adb_port)
+                            state = 6
+                    case 6:
+                        break
+            except (AdbError, AdbTimeout):
+                state = 1
+                continue
+        time.sleep(1)
+        logger.info('Emulator %s(127.0.0.1:%d) now is available.', self.name, self.adb_port)
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}(name="{self.name}", id="{self.id}", adb="{self.adb_ip}:{self.adb_port}"({self.adb_name}))'
+
+Recipe = TypeVar('Recipe', bound=str)
+class HostProtocol(Generic[Recipe], Protocol):
+    @staticmethod
+    def installed() -> bool: ...
+    
+    @staticmethod
+    def list() -> list[Instance]: ...
+    
+    @staticmethod
+    def query(*, id: str) -> Instance | None: ...
+
+    @staticmethod
+    def recipes() -> 'list[Recipe]': ...
+
+if __name__ == '__main__':
+    pass

kotonebot/client/host/windows_common.py

@@ -1,58 +1,73 @@
-from abc import ABC
-from typing import Literal
-from typing_extensions import assert_never
-
-from kotonebot import logging
-from kotonebot.client.device import WindowsDevice
-from kotonebot.util import require_windows
-from .protocol import Device, WindowsHostConfig, RemoteWindowsHostConfig
-
-logger = logging.getLogger(__name__)
-WindowsRecipes = Literal['windows', 'remote_windows']
-
-# Windows 相关的配置类型联合
-WindowsHostConfigs = WindowsHostConfig | RemoteWindowsHostConfig
-
-class CommonWindowsCreateDeviceMixin(ABC):
-    """
-    通用 Windows 创建设备的 Mixin。
-    该 Mixin 定义了创建 Windows 设备的通用接口。
-    """
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        require_windows('CommonWindowsCreateDeviceMixin', self.__class__)
-    
-    def create_device(self, recipe: WindowsRecipes, config: WindowsHostConfigs) -> Device:
-        """
-        创建 Windows 设备。
-        """
-        require_windows('CommonWindowsCreateDeviceMixin.create_device', self.__class__)
-        match recipe:
-            case 'windows':
-                if not isinstance(config, WindowsHostConfig):
-                    raise ValueError(f"Expected WindowsHostConfig for 'windows' recipe, got {type(config)}")
-                from kotonebot.client.implements.windows import WindowsImpl
-                d = WindowsDevice()
-                impl = WindowsImpl(
-                    device=d,
-                    window_title=config.window_title,
-                    ahk_exe_path=config.ahk_exe_path
-                )
-                d._screenshot = impl
-                d._touch = impl
-                return d
-            case 'remote_windows':
-                if not isinstance(config, RemoteWindowsHostConfig):
-                    raise ValueError(f"Expected RemoteWindowsHostConfig for 'remote_windows' recipe, got {type(config)}")
-                from kotonebot.client.implements.remote_windows import RemoteWindowsImpl
-                d = WindowsDevice()
-                impl = RemoteWindowsImpl(
-                    device=d,
-                    host=config.host,
-                    port=config.port
-                )
-                d._screenshot = impl
-                d._touch = impl
-                return d
-            case _:
-                assert_never(f'Unsupported Windows recipe: {recipe}')
+from abc import ABC
+from typing import Literal
+from typing_extensions import assert_never
+
+from kotonebot import logging
+from kotonebot.client.device import WindowsDevice
+from kotonebot.util import require_windows
+from .protocol import Device, WindowsHostConfig, RemoteWindowsHostConfig
+
+logger = logging.getLogger(__name__)
+WindowsRecipes = Literal['windows', 'remote_windows', 'windows_background']
+
+# Windows 相关的配置类型联合
+WindowsHostConfigs = WindowsHostConfig | RemoteWindowsHostConfig
+
+class CommonWindowsCreateDeviceMixin(ABC):
+    """
+    通用 Windows 创建设备的 Mixin。
+    该 Mixin 定义了创建 Windows 设备的通用接口。
+    """
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        require_windows('CommonWindowsCreateDeviceMixin', self.__class__)
+    
+    def create_device(self, recipe: WindowsRecipes, config: WindowsHostConfigs) -> Device:
+        """
+        创建 Windows 设备。
+        """
+        require_windows('CommonWindowsCreateDeviceMixin.create_device', self.__class__)
+        match recipe:
+            case 'windows':
+                if not isinstance(config, WindowsHostConfig):
+                    raise ValueError(f"Expected WindowsHostConfig for 'windows' recipe, got {type(config)}")
+                from kotonebot.client.implements.windows import WindowsImpl
+                d = WindowsDevice()
+                impl = WindowsImpl(
+                    device=d,
+                    window_title=config.window_title,
+                    ahk_exe_path=config.ahk_exe_path
+                )
+                d._screenshot = impl
+                d._touch = impl
+                return d
+            case 'windows_background':
+                if not isinstance(config, WindowsHostConfig):
+                    raise ValueError(f"Expected WindowsHostConfig for 'windows' recipe, got {type(config)}")
+                from kotonebot.client.implements.windows import WindowsImpl
+                d = WindowsDevice()
+                impl = WindowsImpl(
+                    device=d,
+                    window_title=config.window_title,
+                    ahk_exe_path=config.ahk_exe_path
+                )
+                from kotonebot.client.implements.windows.send_message import SendMessageImpl
+                from kotonebot.client.implements.windows.print_window import PrintWindowImpl
+                d._screenshot = PrintWindowImpl(d, config.window_title)
+                d._touch = SendMessageImpl(d, config.window_title)
+                return d
+            case 'remote_windows':
+                if not isinstance(config, RemoteWindowsHostConfig):
+                    raise ValueError(f"Expected RemoteWindowsHostConfig for 'remote_windows' recipe, got {type(config)}")
+                from kotonebot.client.implements.remote_windows import RemoteWindowsImpl
+                d = WindowsDevice()
+                impl = RemoteWindowsImpl(
+                    device=d,
+                    host=config.host,
+                    port=config.port
+                )
+                d._screenshot = impl
+                d._touch = impl
+                return d
+            case _:
+                assert_never(f'Unsupported Windows recipe: {recipe}')