autoxkit 2.1.1__tar.gz → 2.2.1__tar.gz

{autoxkit-2.1.1 → autoxkit-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.1.1
+Version: 2.2.1
 Summary: Python library for Windows automation and Android device screen casting and control
 Author-email: YorickFin <1582456060@qq.com>
 License: GPL-3.0-or-later

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/__init__.py

@@ -1,4 +1,4 @@
-"""Android device control module."""
+"""Android 设备控制模块。"""
 
 from __future__ import annotations
 
@@ -23,13 +23,12 @@ __all__ = [
 
 
 class AndroidDevice:
-    """Synchronous Android device controller.
+    """同步 Android 设备控制器。
 
-    Wraps the async ``ScrcpyClient`` in a background thread so all public
-    methods are regular synchronous calls, suitable for use inside hook
-    callbacks (``key_down``, ``key_up``, etc.).
+    将异步的 ``ScrcpyClient`` 封装在后台线程中，使所有公共方法都成为
+    普通的同步调用，适合在钩子回调中使用（``key_down``、``key_up`` 等）。
 
-    Usage::
+    用法::
 
         from autoxkit.android import AndroidDevice
 
@@ -55,7 +54,7 @@ class AndroidDevice:
         self._client: ScrcpyClient | None = None
         self._session_size: tuple[int, int] | None = None
 
-    # ── Connection management ────────────────────────────────
+    # ── 连接管理 ────────────────────────────────
 
     def connect(
         self,
@@ -66,50 +65,50 @@ class AndroidDevice:
         control: bool = True,
         **kwargs: Any,
     ) -> None:
-        """Connect to an Android device via scrcpy-server.
+        """通过 scrcpy-server 连接到 Android 设备。
 
-        Parameters are forwarded to :class:`ScrcpyOptions`.  Common extras:
+        参数将传递给 :class:`ScrcpyOptions`。常用额外参数：
 
-        - ``tunnel_forward`` (bool): use ``adb forward`` instead of
-          ``adb reverse``.
-        - ``tcpip`` (bool): enable ADB-over-TCP/IP before starting.
-        - ``tcpip_dst`` (str): known wireless ADB address.
+        - ``tunnel_forward`` (bool): 使用 ``adb forward`` 而不是
+          ``adb reverse``。
+        - ``tcpip`` (bool): 启动前启用 ADB over TCP/IP。
+        - ``tcpip_dst`` (str): 已知的无线 ADB 地址。
         """
         self._submit(
             self._connect_async(serial, video=video, audio=audio, control=control, **kwargs)
         )
 
     def disconnect(self) -> None:
-        """Disconnect from the device and stop the scrcpy-server."""
+        """断开与设备的连接并停止 scrcpy-server。"""
         self._submit(self._disconnect_async())
 
     @property
     def connected(self) -> bool:
         return self._client is not None
 
-    # ── Touch ────────────────────────────────────────────────
+    # ── 触摸 ────────────────────────────────────────────────
 
     def touch(self, x: int, y: int, action: str) -> None:
-        """Send a touch event.
+        """发送触摸事件。
 
         Args:
-            x: Screen X coordinate.
-            y: Screen Y coordinate.
-            action: ``"down"``, ``"up"``, or ``"move"``.
+            x: 屏幕 X 坐标。
+            y: 屏幕 Y 坐标。
+            action: ``"down"``、``"up"`` 或 ``"move"``。
         """
         action_code = {"down": 0, "up": 1, "move": 2}.get(action)
         if action_code is None:
-            raise ValueError(f"invalid touch action: {action!r} (use down/up/move)")
+            raise ValueError(f"无效的触摸动作：{action!r}（请使用 down/up/move）")
         self._submit(self._touch_async(action_code, x, y))
 
     def tap(self, x: int, y: int, delay: float = 0.05) -> None:
-        """Perform a tap (touch down then up) at screen coordinates."""
+        """在屏幕坐标上执行点击（触摸按下然后抬起）。"""
         self.touch(x, y, "down")
         time.sleep(delay)
         self.touch(x, y, "up")
 
     def swipe(self, x1: int, y1: int, x2: int, y2: int, steps: int = 10) -> None:
-        """Perform a swipe gesture from (x1, y1) to (x2, y2)."""
+        """执行从 (x1, y1) 到 (x2, y2) 的滑动手势。"""
         self.touch(x1, y1, "down")
         for i in range(1, steps + 1):
             t = i / steps
@@ -118,33 +117,33 @@ class AndroidDevice:
             self.touch(cx, cy, "move")
         self.touch(x2, y2, "up")
 
-    # ── Keycode ──────────────────────────────────────────────
+    # ── 按键码 ──────────────────────────────────────────────
 
     def keycode(self, keycode: int, action: str = "down") -> None:
-        """Send an Android keycode event.
+        """发送 Android 按键码事件。
 
         Args:
-            keycode: Android keycode (e.g. 4 = BACK, 3 = HOME).
-            action: ``"down"`` or ``"up"``.
+            keycode: Android 按键码（例如 4 = 返回，3 = 主页）。
+            action: ``"down"`` 或 ``"up"``。
         """
         action_code = {"down": 0, "up": 1}.get(action)
         if action_code is None:
-            raise ValueError(f"invalid key action: {action!r} (use down/up)")
+            raise ValueError(f"无效的按键动作：{action!r}（请使用 down/up）")
         self._submit(self._keycode_async(action_code, keycode))
 
     def key_press(self, keycode: int) -> None:
-        """Press and release a key (simulates a single tap)."""
+        """按下并释放按键（模拟单次点击）。"""
         self.keycode(keycode, "down")
         time.sleep(0.02)
         self.keycode(keycode, "up")
 
-    # ── Clipboard ────────────────────────────────────────────
+    # ── 剪贴板 ────────────────────────────────────────────
 
     def set_clipboard(self, text: str, paste: bool = False) -> None:
-        """Set the device clipboard (optionally also paste)."""
+        """设置设备剪贴板（可选同时粘贴）。"""
         self._submit(self._clipboard_async(text, paste))
 
-    # ── Internal async helpers ───────────────────────────────
+    # ── 内部异步辅助方法 ───────────────────────────────
 
     async def _connect_async(
         self,
@@ -178,21 +177,21 @@ class AndroidDevice:
 
     async def _touch_async(self, action: int, x: int, y: int) -> None:
         if self._client is None or self._client.control is None:
-            raise RuntimeError("device not connected")
+            raise RuntimeError("未连接到设备")
         width, height = self._session_size or (1, 1)
         await self._client.control.send_touch(action, x, y, width, height)
 
     async def _keycode_async(self, action: int, keycode: int) -> None:
         if self._client is None or self._client.control is None:
-            raise RuntimeError("device not connected")
+            raise RuntimeError("未连接到设备")
         await self._client.control.send_keycode(action, keycode)
 
     async def _clipboard_async(self, text: str, paste: bool) -> None:
         if self._client is None or self._client.control is None:
-            raise RuntimeError("device not connected")
+            raise RuntimeError("未连接到设备")
         await self._client.control.set_clipboard(text, sequence=1, paste=paste)
 
-    # ── Async loop bridge ────────────────────────────────────
+    # ── 异步循环桥接 ─────────────────────────────────────
 
     def _submit(self, coro: Any) -> Any:
         future = asyncio.run_coroutine_threadsafe(coro, self._loop)

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/adb.py

@@ -1,4 +1,4 @@
-"""ADB launcher for scrcpy-server v4.0."""
+"""ADB 启动器，用于 scrcpy-server v4.0."""
 
 from __future__ import annotations
 
@@ -40,33 +40,33 @@ class AdbServerLauncher:
         await self._adb("tcpip", str(port))
 
     async def get_device_ip(self) -> str:
-        """Parse the Wi-Fi IP address from `adb shell ip route`.
+        """从 `adb shell ip route` 解析 Wi-Fi IP 地址。
 
-        Only considers lines where the interface name starts with ``wlan``,
-        matching the official scrcpy behavior to skip non-Wi-Fi interfaces
-        such as rmnet_data (mobile data) or usb0 (USB tethering).
+        仅考虑接口名称以 ``wlan`` 开头的行，
+        与官方 scrcpy 行为一致，跳过非 Wi-Fi 接口，
+        例如 rmnet_data（移动数据）或 usb0（USB 共享网络）。
         """
         route = await self.shell_output("ip", "route")
         for line in route.splitlines():
-            # Look for lines like:
+            # 查找类似如下的行：
             #   192.168.1.0/24 dev wlan0  proto kernel  scope link  src 192.168.1.x
             fields = line.split()
             for i, field in enumerate(fields):
                 if field == "dev" and i + 1 < len(fields) and fields[i + 1].startswith("wlan"):
-                    # Found a wlan line, extract the src IP
+                    # 找到 wlan 行，提取源 IP
                     for j, f in enumerate(fields):
                         if f == "src" and j + 1 < len(fields):
                             ip = fields[j + 1]
                             if re.match(r"^\d{1,3}(\.\d{1,3}){3}$", ip):
                                 return ip
         raise AdbError(
-            f"could not find Wi-Fi (wlan) device ip in `adb shell ip route`: {route.strip()}"
+            f"在 `adb shell ip route` 中找不到 Wi-Fi（wlan）设备的 IP: {route.strip()}"
         )
 
     async def discover_usb_serial(self) -> str | None:
-        """Discover the serial of a single USB-connected device.
+        """发现单个 USB 连接设备的序列号。
 
-        Returns None if there is no USB device, or if there are multiple.
+        如果没有 USB 设备或有多个设备，则返回 None。
         """
         proc = await asyncio.create_subprocess_exec(
             str(self.adb_path),
@@ -80,7 +80,7 @@ class AdbServerLauncher:
 
         usb_serials = []
         for line in out.splitlines():
-            # Skip empty lines and the "List of devices attached" header
+            # 跳过空行和 "List of devices attached" 标题行
             if not line.strip() or not line[0].isalnum():
                 continue
             parts = line.split()
@@ -90,8 +90,8 @@ class AdbServerLauncher:
             state = parts[1]
             if state != "device":
                 continue
-            # USB devices have serials without ":"
-            # TCP/IP devices have format ip:port
+            # USB 设备的序列号不包含 ":"
+            # TCP/IP 设备的格式为 ip:port
             if ":" not in serial:
                 usb_serials.append(serial)
 

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/binary.py

@@ -1,4 +1,4 @@
-"""Binary helpers for the scrcpy v4.0 protocol."""
+"""scrcpy v4.0 协议的二进制辅助函数。"""
 
 from __future__ import annotations
 
@@ -10,15 +10,15 @@ ReadExact = Callable[[int], Awaitable[bytes]]
 
 
 class ProtocolError(Exception):
-    """Raised when bytes on the wire do not match the expected protocol."""
+    """当网络上的字节不符合预期协议时抛出。"""
 
 
 class StreamDisabledError(ProtocolError):
-    """Raised when scrcpy-server explicitly disables a media stream."""
+    """当 scrcpy-server 显式禁用媒体流时抛出。"""
 
 
 class StreamConfigurationError(ProtocolError):
-    """Raised when scrcpy-server reports a media stream configuration error."""
+    """当 scrcpy-server 报告媒体流配置错误时抛出。"""
 
 
 def u16be(value: int) -> bytes:
@@ -65,7 +65,7 @@ async def read_exact(reader: asyncio.StreamReader, size: int) -> bytes:
     try:
         return await reader.readexactly(size)
     except asyncio.IncompleteReadError as exc:
-        raise EOFError(f"expected {size} bytes, got {len(exc.partial)}") from exc
+        raise EOFError(f"期望 {size} 字节，实际获取 {len(exc.partial)} 字节") from exc
 
 
 def utf8_truncate(text: str, max_bytes: int) -> bytes:
@@ -88,7 +88,7 @@ def string32(text: str, max_payload_len: int) -> bytes:
 
 def string8(text: str, max_payload_len: int = 255) -> bytes:
     if max_payload_len > 255:
-        raise ValueError("1-byte strings may not exceed 255 bytes")
+        raise ValueError("1字节字符串不能超过255字节")
     raw = utf8_truncate(text, max_payload_len)
     return bytes([len(raw)]) + raw
 

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/client.py

@@ -1,4 +1,4 @@
-"""High-level scrcpy-server v4.0 client facade."""
+"""高级 scrcpy-server v4.0 客户端外观类。"""
 
 from __future__ import annotations
 
@@ -15,7 +15,7 @@ from .streams import AudioStream, AudioVideoCombinedStream, ControlStream, DEVIC
 
 @dataclass(slots=True)
 class ScrcpyOptions:
-    """Options used to launch and connect to scrcpy-server v4.0."""
+    """用于启动和连接 scrcpy-server v4.0 的选项。"""
 
     serial: str | None = None
     adb_path: Path = Path("scrcpy-win64-v4.0") / "adb.exe"
@@ -32,87 +32,83 @@ class ScrcpyOptions:
     push_server: bool = True
     merge_video_config_packets: bool = True
     tcpip: bool = False
-    """Enable ADB-over-TCP/IP before starting scrcpy-server.
+    """在启动 scrcpy-server 之前启用 ADB-over-TCP/IP。
 
-    If ``tcpip_dst`` is set, the client runs ``adb connect`` to that address
-    and uses it as the device serial. If ``tcpip_dst`` is not set, the client
-    assumes a USB device is currently selected, reads its WLAN IP address from
-    ``adb shell ip route``, runs ``adb tcpip <tcpip_port>``, then connects to
-    ``<device-ip>:<tcpip_port>``.
+    如果设置了 ``tcpip_dst``，客户端运行 ``adb connect`` 连接到该地址，
+    并将其用作设备序列号。如果未设置 ``tcpip_dst``，客户端
+    假设当前选择了一个 USB 设备，从 ``adb shell ip route`` 读取其 WLAN IP 地址，
+    运行 ``adb tcpip <tcpip_port>``，然后连接到 ``<device-ip>:<tcpip_port>``。
     """
 
     tcpip_dst: str | None = None
-    """Known wireless ADB address.
+    """已知的无线 ADB 地址。
 
-    Accepted forms are ``"192.168.1.23"`` and ``"192.168.1.23:5555"``. If the
-    port is omitted, ``tcpip_port`` is appended.
+    接受的格式为 ``"192.168.1.23"`` 和 ``"192.168.1.23:5555"``。如果省略端口，
+    则会附加 ``tcpip_port``。
     """
 
     tcpip_port: int = 5555
-    """Wireless ADB TCP port used for ``adb tcpip`` and default address ports."""
+    """用于 ``adb tcpip`` 和默认地址端口的无线 ADB TCP 端口。"""
 
     tcpip_disconnect_existing: bool = False
-    """Run ``adb disconnect <address>`` before ``adb connect <address>``."""
+    """在 ``adb connect <address>`` 之前运行 ``adb disconnect <address>``。"""
 
     server_args: list[str] = field(default_factory=list)
-    """Additional raw ``key=value`` arguments passed to ``scrcpy-server``.
-
-    These values are appended after the arguments managed directly by
-    ``ScrcpyClient``. Avoid overriding managed keys (``scid``, ``log_level``,
-    ``video``, ``audio``, ``control`` and ``tunnel_forward``) unless you also
-    update the Python-side connection logic accordingly.
-
-    Common scrcpy-server v4.0 values:
-
-    - ``video_codec``: ``h264``, ``h265`` or ``av1``.
-    - ``audio_codec``: ``opus``, ``aac``, ``flac`` or ``raw``.
-    - ``video_source``: ``display`` or ``camera``.
-    - ``audio_source``: ``output``, ``mic``, ``playback``,
-      ``mic-unprocessed``, ``mic-camcorder``, ``mic-voice-recognition``,
-      ``mic-voice-communication``, ``voice-call``, ``voice-call-uplink``,
-      ``voice-call-downlink`` or ``voice-performance``.
-    - ``video_bit_rate`` / ``audio_bit_rate``: integer bit rate in bits/s.
-    - ``max_size``: integer max video dimension, ``0`` for no limit.
-    - ``max_fps``: float/integer FPS string, for example ``30`` or ``60``.
-    - ``min_size_alignment``: ``1``, ``2``, ``4``, ``8`` or ``16``.
-    - ``angle``: float degrees string.
-    - ``crop``: ``width:height:x:y``.
+    """传递给 ``scrcpy-server`` 的额外原始 ``key=value`` 参数。
+
+    这些值会附加在 ``ScrcpyClient`` 直接管理的参数之后。除非你也相应地更新了
+    Python 端的连接逻辑，否则避免覆盖已管理的键（``scid``、``log_level``、
+    ``video``、``audio``、``control`` 和 ``tunnel_forward``）。
+
+    scrcpy-server v4.0 的常见值：
+
+    - ``video_codec``: ``h264``、``h265`` 或 ``av1``。
+    - ``audio_codec``: ``opus``、``aac``、``flac`` 或 ``raw``。
+    - ``video_source``: ``display`` 或 ``camera``。
+    - ``audio_source``: ``output``、``mic``、``playback``、
+      ``mic-unprocessed``、``mic-camcorder``、``mic-voice-recognition``、
+      ``mic-voice-communication``、``voice-call``、``voice-call-uplink``、
+      ``voice-call-downlink`` 或 ``voice-performance``。
+    - ``video_bit_rate`` / ``audio_bit_rate``: 整数比特率（单位：比特/秒）。
+    - ``max_size``: 整数最大视频尺寸，``0`` 表示无限制。
+    - ``max_fps``: 浮点数/整数 FPS 字符串，例如 ``30`` 或 ``60``。
+    - ``min_size_alignment``: ``1``、``2``、``4``、``8`` 或 ``16``。
+    - ``angle``: 浮点度数字符串。
+    - ``crop``: ``width:height:x:y``。
     - ``video_codec_options`` / ``audio_codec_options``:
-      comma-separated MediaCodec options, ``key[:type]=value``.
-    - ``video_encoder`` / ``audio_encoder``: Android encoder name.
-    - ``display_id``: integer display id.
-    - ``new_display``: empty string, ``widthxheight``, ``/dpi`` or
-      ``widthxheight/dpi``.
-    - ``flex_display``: boolean.
-    - ``display_ime_policy``: ``local``, ``fallback`` or ``hide``.
-    - ``vd_destroy_content`` / ``vd_system_decorations``: boolean.
-    - ``capture_orientation``: orientation name, optionally prefixed with
-      ``@`` to lock it; ``@`` alone locks the initial orientation.
-    - ``camera_id``: camera id string.
-    - ``camera_size``: ``widthxheight``.
-    - ``camera_facing``: ``front``, ``back`` or ``external``.
-    - ``camera_ar``: ``sensor``, ``width:height`` or a float ratio.
-    - ``camera_fps``: integer FPS.
+      逗号分隔的 MediaCodec 选项，``key[:type]=value``。
+    - ``video_encoder`` / ``audio_encoder``: Android 编码器名称。
+    - ``display_id``: 整数显示 ID。
+    - ``new_display``: 空字符串、``widthxheight``、``/dpi`` 或
+      ``widthxheight/dpi``。
+    - ``flex_display``: 布尔值。
+    - ``display_ime_policy``: ``local``、``fallback`` 或 ``hide``。
+    - ``vd_destroy_content`` / ``vd_system_decorations``: 布尔值。
+    - ``capture_orientation``: 方向名称，可选择以 ``@`` 前缀锁定；``@`` 单独使用锁定初始方向。
+    - ``camera_id``: 相机 ID 字符串。
+    - ``camera_size``: ``widthxheight``。
+    - ``camera_facing``: ``front``、``back`` 或 ``external``。
+    - ``camera_ar``: ``sensor``、``width:height`` 或浮点比率。
+    - ``camera_fps``: 整数 FPS。
     - ``camera_high_speed`` / ``camera_torch`` / ``audio_dup`` /
       ``show_touches`` / ``stay_awake`` / ``power_off_on_close`` /
       ``clipboard_autosync`` / ``downsize_on_error`` / ``cleanup`` /
-      ``power_on`` / ``keep_active``: boolean.
-    - ``screen_off_timeout``: integer milliseconds, or ``-1`` for unchanged.
-    - ``list_encoders``, ``list_displays``, ``list_cameras``,
-      ``list_camera_sizes`` and ``list_apps``: boolean listing modes.
-    - ``send_device_meta``, ``send_frame_meta``, ``send_dummy_byte``,
-      ``send_stream_meta`` and ``raw_stream``: protocol/testing booleans.
-
-    Booleans are passed as ``true`` or ``false``. Values must use
-    scrcpy-server v4.0 option names and wire formats; no validation or shell
-    escaping is performed by this client.
+      ``power_on`` / ``keep_active``: 布尔值。
+    - ``screen_off_timeout``: 整数毫秒，或 ``-1`` 表示不变。
+    - ``list_encoders``、``list_displays``、``list_cameras``、
+      ``list_camera_sizes`` 和 ``list_apps``: 布尔值列表模式。
+    - ``send_device_meta``、``send_frame_meta``、``send_dummy_byte``、
+      ``send_stream_meta`` 和 ``raw_stream``: 协议/测试布尔值。
+
+    布尔值传递为 ``true`` 或 ``false``。值必须使用 scrcpy-server v4.0 的选项名称和
+    有线格式；此客户端不执行任何验证或 shell 转义。
     """
 
 
 class ScrcpyClient:
     def __init__(self, options: ScrcpyOptions) -> None:
         if not (options.video or options.audio or options.control):
-            raise ValueError("at least one of video, audio or control must be enabled")
+            raise ValueError("必须至少启用 video、audio 或 control 中的一项")
         self.options = options
         self.scid = options.scid if options.scid is not None else random.getrandbits(31)
         self.socket_name = f"scrcpy_{self.scid:08x}"
@@ -132,10 +128,10 @@ class ScrcpyClient:
         if self.options.push_server:
             await self.launcher.push_server()
 
-        # Auto-detect TCP/IP (wireless) serials — ADB reverse does not
-        # work over wireless ADB, so fall back to forward tunnel automatically.
+        # 自动检测 TCP/IP（无线）序列号 — ADB reverse 在无线 ADB 上不工作，
+        # 因此自动回退到正向隧道。
         if self._is_tcpip_address(self.launcher.serial) and not self.options.tunnel_forward:
-            print("TCP/IP device detected, using adb forward tunnel")
+            print("检测到 TCP/IP 设备，使用 adb forward 隧道")
             await self._start_forward()
         elif self.options.tunnel_forward:
             await self._start_forward()
@@ -193,14 +189,14 @@ class ScrcpyClient:
 
     @staticmethod
     def _is_tcpip_address(serial: str | None) -> bool:
-        """Return True if the serial looks like a TCP/IP address (ip:port)."""
+        """如果序列号看起来像 TCP/IP 地址（ip:port），返回 True。"""
         return serial is not None and ":" in serial
 
     async def _start_reverse(self) -> None:
         self._tcp_server = await asyncio.start_server(self._on_accept, self.options.host, self.options.port)
         sockets = self._tcp_server.sockets or []
         if not sockets:
-            raise RuntimeError("failed to create local server socket")
+            raise RuntimeError("无法创建本地服务器套接字")
         self._port = int(sockets[0].getsockname()[1])
         await self.launcher.reverse(self.socket_name, self._port)
         self._server_process = await self._start_server_process(tunnel_forward=False)
@@ -208,11 +204,11 @@ class ScrcpyClient:
 
     async def _start_forward(self) -> None:
         self._port = self.options.port or 27183
-        # Remove any stale forward mapping first to avoid conflicts
+        # 首先移除任何陈旧的正向映射以避免冲突
         await self.launcher.remove_forward(self._port)
         await self.launcher.forward(self.socket_name, self._port)
         self._server_process = await self._start_server_process(tunnel_forward=True)
-        # Give the server time to create the LocalServerSocket before connecting
+        # 在连接之前给服务器时间创建 LocalServerSocket
         await asyncio.sleep(1)
         await self._connect_streams(read_dummy_byte=True)
 
@@ -251,7 +247,7 @@ class ScrcpyClient:
             except OSError as exc:
                 last_error = exc
                 await asyncio.sleep(0.1)
-        raise ConnectionError(f"could not connect to forwarded scrcpy socket: {last_error}")
+        raise ConnectionError(f"无法连接到转发的 scrcpy 套接字: {last_error}")
 
     async def _assign_streams(
         self,
@@ -288,4 +284,4 @@ class ScrcpyClient:
         return self
 
     async def __aexit__(self, exc_type: object, exc: object, tb: object) -> None:
-        await self.stop()
+        await self.stop()

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/control.py

@@ -1,4 +1,4 @@
-"""Control and device-message serializers for scrcpy-server v4.0."""
+"""scrcpy-server v4.0 的控制消息和设备消息序列化器。"""
 
 from __future__ import annotations
 
@@ -33,10 +33,10 @@ MAX_TOUCH_POINTERS = 10
 
 
 class PointerManager:
-    """Manages a pool of unique pointer IDs for multi-touch.
+    """管理多点触控的唯一指针 ID 池。
 
-    Allocates pointer IDs from 0 upward, up to `MAX_TOUCH_POINTERS`
-    concurrent touches. IDs are reused when released.
+    从 0 开始分配指针 ID，最多支持 `MAX_TOUCH_POINTERS` 个并发触摸。
+    释放后 ID 可被重用。
     """
 
     def __init__(self) -> None:
@@ -45,10 +45,10 @@ class PointerManager:
         self._active: set[int] = set()
 
     def allocate(self) -> int | None:
-        """Allocate a unique pointer ID.
+        """分配一个唯一的指针 ID。
 
-        Returns an integer pointer ID, or `None` if the maximum number
-        of concurrent touches (`MAX_TOUCH_POINTERS`) has been reached.
+        返回一个整数指针 ID，如果已达到最大并发触摸数 (`MAX_TOUCH_POINTERS`)，
+        则返回 `None`。
         """
         if len(self._active) >= MAX_TOUCH_POINTERS:
             return None
@@ -61,23 +61,23 @@ class PointerManager:
         return pid
 
     def release(self, pointer_id: int) -> None:
-        """Release a previously allocated pointer ID back to the pool."""
+        """将之前分配的指针 ID 释放回池中。"""
         if pointer_id in self._active:
             self._active.discard(pointer_id)
             self._freed.append(pointer_id)
 
     def reset(self) -> None:
-        """Release all active pointer IDs."""
+        """释放所有活跃的指针 ID。"""
         self._active.clear()
         self._freed.clear()
         self._next_id = 0
 
     def active_count(self) -> int:
-        """Return the number of currently active pointer IDs."""
+        """返回当前活跃的指针 ID 数量。"""
         return len(self._active)
 
     def active_ids(self) -> set[int]:
-        """Return the set of currently active pointer IDs."""
+        """返回当前活跃的指针 ID 集合。"""
         return set(self._active)
 
 
@@ -172,7 +172,7 @@ def empty(message_type: ControlMessageType) -> ControlMessage:
         ControlMessageType.CAMERA_ZOOM_IN,
         ControlMessageType.CAMERA_ZOOM_OUT,
     }:
-        raise ValueError(f"{message_type.name} is not an empty control message")
+        raise ValueError(f"{message_type.name} 不是一个空控制消息")
     return ControlMessage(message_type, bytes([message_type]))
 
 
@@ -218,7 +218,7 @@ def deserialize_device_message(buffer: bytes) -> tuple[DeviceMessage | None, int
     try:
         message_type = DeviceMessageType(buffer[0])
     except ValueError as exc:
-        raise ProtocolError(f"unknown device message type: {buffer[0]}") from exc
+        raise ProtocolError(f"未知的设备消息类型: {buffer[0]}") from exc
 
     if message_type is DeviceMessageType.CLIPBOARD:
         if len(buffer) < 5:

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/control_backup.py

@@ -1,4 +1,4 @@
-"""Control and device-message serializers for scrcpy-server v4.0."""
+"""scrcpy-server v4.0 的控制消息和设备消息序列化器。"""
 
 from __future__ import annotations
 
@@ -120,7 +120,7 @@ def empty(message_type: ControlMessageType) -> ControlMessage:
         ControlMessageType.CAMERA_ZOOM_IN,
         ControlMessageType.CAMERA_ZOOM_OUT,
     }:
-        raise ValueError(f"{message_type.name} is not an empty control message")
+        raise ValueError(f"{message_type.name} 不是空控制消息")
     return ControlMessage(message_type, bytes([message_type]))
 
 
@@ -166,7 +166,7 @@ def deserialize_device_message(buffer: bytes) -> tuple[DeviceMessage | None, int
     try:
         message_type = DeviceMessageType(buffer[0])
     except ValueError as exc:
-        raise ProtocolError(f"unknown device message type: {buffer[0]}") from exc
+        raise ProtocolError(f"未知的设备消息类型: {buffer[0]}") from exc
 
     if message_type is DeviceMessageType.CLIPBOARD:
         if len(buffer) < 5:

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/models.py

@@ -1,4 +1,4 @@
-"""Protocol data models for scrcpy-server v4.0."""
+"""scrcpy-server v4.0 的协议数据模型。"""
 
 from __future__ import annotations
 

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/android/streams.py

@@ -1,4 +1,4 @@
-"""Async stream readers and writers for scrcpy-server v4.0."""
+"""scrcpy-server v4.0 的异步流读取器和写入器。"""
 
 from __future__ import annotations
 
@@ -34,13 +34,13 @@ class BaseMediaStream:
     async def read_codec(self) -> CodecId:
         raw = read_u32be(await read_exact(self.reader, 4))
         if raw == 0:
-            raise StreamDisabledError(f"{self.kind.value} stream disabled by device")
+            raise StreamDisabledError(f"设备禁用了 {self.kind.value} 流")
         if raw == 1:
-            raise StreamConfigurationError(f"{self.kind.value} stream configuration error on device")
+            raise StreamConfigurationError(f"设备上 {self.kind.value} 流配置错误")
         try:
             codec = CodecId(raw)
         except ValueError as exc:
-            raise ProtocolError(f"unknown codec id: 0x{raw:08x}") from exc
+            raise ProtocolError(f"未知的编解码器ID: 0x{raw:08x}") from exc
         self.codec = codec
         return codec
 
@@ -54,11 +54,11 @@ class BaseMediaStream:
         assert self.codec is not None
         header = await read_exact(self.reader, PACKET_HEADER_SIZE)
         if header[0] & 0x80:
-            raise ProtocolError("unexpected video session packet on media stream")
+            raise ProtocolError("媒体流上出现意外的视频会话数据包")
         pts_flags = read_u64be(header, 0)
         size = read_u32be(header, 8)
         if size <= 0:
-            raise ProtocolError("invalid media packet size: 0")
+            raise ProtocolError("无效的媒体数据包大小: 0")
         payload = await read_exact(self.reader, size)
         config = bool(pts_flags & PACKET_FLAG_CONFIG)
         key_frame = bool(pts_flags & PACKET_FLAG_KEY_FRAME)
@@ -83,7 +83,7 @@ class VideoStream(BaseMediaStream):
             await self.read_codec()
         header = await read_exact(self.reader, PACKET_HEADER_SIZE)
         if not header[0] & 0x80:
-            raise ProtocolError("expected video session packet")
+            raise ProtocolError("期望视频会话数据包")
         session = VideoSession(
             width=read_u32be(header, 4),
             height=read_u32be(header, 8),
@@ -137,7 +137,7 @@ class VideoStream(BaseMediaStream):
         pts_flags = read_u64be(header, 0)
         size = read_u32be(header, 8)
         if size <= 0:
-            raise ProtocolError("invalid video packet size: 0")
+            raise ProtocolError("无效的视频数据包大小: 0")
         payload = await read_exact(self.reader, size)
         config = bool(pts_flags & PACKET_FLAG_CONFIG)
         key_frame = bool(pts_flags & PACKET_FLAG_KEY_FRAME)
@@ -226,17 +226,16 @@ class ControlStream:
         action_button: int = 0,
         buttons: int = 0,
     ) -> int | None:
-        """Send a touch event with automatic pointer ID management.
+        """发送带有自动指针ID管理的触摸事件。
 
-        On ``ACTION_DOWN``: if *pointer_id* is ``None``, a new ID is
-        allocated from ``self.pointer_manager``. The final pointer_id
-        is returned (or ``None`` if allocation failed).
+        在 ``ACTION_DOWN`` 时：如果 *pointer_id* 是 ``None``，则从
+        ``self.pointer_manager`` 分配一个新ID。返回最终的 pointer_id
+        （如果分配失败则返回 ``None``）。
 
-        On ``ACTION_UP``: the given *pointer_id* is released back to
-        the pool after sending.
+        在 ``ACTION_UP`` 时：发送后将给定的 *pointer_id* 释放回池。
 
-        When ``self.pointer_manager`` is ``None``, falls back to the
-        default ``POINTER_ID_GENERIC_FINGER``.
+        当 ``self.pointer_manager`` 为 ``None`` 时，回退到默认的
+        ``POINTER_ID_GENERIC_FINGER``。
         """
         pm = self.pointer_manager
 
@@ -288,7 +287,7 @@ class ControlStream:
 
 
 class AudioVideoCombinedStream:
-    """A local virtual stream merging video and audio events from official sockets."""
+    """从官方套接字合并视频和音频事件的本地虚拟流。"""
 
     def __init__(self, video: VideoStream | None, audio: AudioStream | None) -> None:
         self.video = video

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit/hook/hook_listener.py

@@ -1,13 +1,16 @@
-
 # hook_listener.py
 import ctypes
 from ctypes import wintypes, Structure, POINTER, CFUNCTYPE, byref
 import threading
+import time
 from .event import KeyEvent, MouseEvent
 from ..constants import Hex_Hook_Code
 
 HHC = Hex_Hook_Code
 
+# 消息泵空闲轮询间隔（秒），无消息时休眠此时间以释放 CPU
+MSG_POLL_INTERVAL = 0.001
+
 # ---------- 结构体定义 ----------
 class KBDLLHOOKSTRUCT(Structure):
     _fields_ = [
@@ -30,7 +33,7 @@ class MSLLHOOKSTRUCT(Structure):
 # ---------- 回调类型 ----------
 HOOKPROC = CFUNCTYPE(ctypes.c_long, ctypes.c_int, wintypes.WPARAM, wintypes.LPARAM)
 
-# ---------- 加载 DLL 并声明 API 签名（你指出必须有的部分） ----------
+# ---------- 加载 DLL 并声明 API 签名 ----------
 user32 = ctypes.WinDLL('user32', use_last_error=True)
 kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
 
@@ -163,7 +166,9 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            raise e
+                            print(f"[hook_listener] ValueError in keydown callback: {e}", file=__import__('sys').stderr)
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in keydown callback: {e}", file=__import__('sys').stderr)
                 elif wParam in (HHC["KeyUp"], HHC["SysKeyUp"]):
                     event = KeyEvent('KeyUp', kbd.vkCode)
                     for cb in self._on_keyup:
@@ -172,9 +177,11 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            raise e
+                            print(f"[hook_listener] ValueError in keyup callback: {e}", file=__import__('sys').stderr)
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in keyup callback: {e}", file=__import__('sys').stderr)
             except Exception as e:
-                raise e
+                print(f"[hook_listener] Exception in _keyboard_proc: {e}", file=__import__('sys').stderr)
 
         return user32.CallNextHookEx(self.keyboard_hook, nCode, wParam, lParam)
 
@@ -194,7 +201,7 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            raise e
+                            print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__('sys').stderr)
 
                 elif wParam in (HHC["MLeftUp"], HHC["MRightUp"], HHC["MiddleUp"], HHC["XUp"]):
                     button = self._get_mouse_button(wParam, ms.mouseData)
@@ -205,9 +212,9 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            raise e
+                            print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__('sys').stderr)
             except Exception as e:
-                raise e
+                print(f"[hook_listener] Exception in _mouse_proc: {e}", file=__import__('sys').stderr)
 
         return user32.CallNextHookEx(self.mouse_hook, nCode, wParam, lParam)
 
@@ -276,9 +283,12 @@ class HookListener:
                 if user32.PeekMessageW(byref(msg), 0, 0, 0, 1):  # PM_REMOVE = 1
                     user32.TranslateMessage(byref(msg))
                     user32.DispatchMessageW(byref(msg))
+                else:
+                    # 无消息时休眠，避免 CPU 忙等
+                    time.sleep(MSG_POLL_INTERVAL)
             except Exception:
                 # 记录异常但不退出循环，确保钩子持续工作
-                # 回调中的异常应由上层自行处理
+                print("[hook_listener] Exception in message pump", file=__import__('sys').stderr)
                 continue
 
         # 离开循环之前确保取消钩子

{autoxkit-2.1.1 → autoxkit-2.2.1}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.1.1
+Version: 2.2.1
 Summary: Python library for Windows automation and Android device screen casting and control
 Author-email: YorickFin <1582456060@qq.com>
 License: GPL-3.0-or-later

{autoxkit-2.1.1 → autoxkit-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "autoxkit"
-version = "2.1.1"
+version = "2.2.1"
 description = "Python library for Windows automation and Android device screen casting and control"
 readme = "README.md"
 requires-python = ">=3.10"