autoxkit 2.0.0__tar.gz → 2.1.0__tar.gz

{autoxkit-2.0.0 → autoxkit-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.0.0
+Version: 2.1.0
 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.0.0 → autoxkit-2.1.0}/autoxkit/android/adb.py

@@ -3,10 +3,17 @@
 from __future__ import annotations
 
 import asyncio
+import os
 import re
+import subprocess
 from dataclasses import dataclass
 from pathlib import Path
 
+if os.name == "nt":
+    _CREATE_NO_WINDOW = subprocess.CREATE_NO_WINDOW
+else:
+    _CREATE_NO_WINDOW = 0
+
 
 class AdbError(RuntimeError):
     pass
@@ -66,6 +73,7 @@ class AdbServerLauncher:
             "devices", "-l",
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
+            creationflags=_CREATE_NO_WINDOW,
         )
         stdout, _ = await proc.communicate()
         out = stdout.decode(errors="replace")
@@ -149,6 +157,7 @@ class AdbServerLauncher:
             *args,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
+            creationflags=_CREATE_NO_WINDOW,
         )
 
     async def _adb(self, *args: str, check: bool = True) -> asyncio.subprocess.Process:
@@ -173,6 +182,7 @@ class AdbServerLauncher:
             *args,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
+            creationflags=_CREATE_NO_WINDOW,
         )
         stdout, stderr = await proc.communicate()
         out = stdout.decode(errors="replace").strip()

autoxkit-2.1.0/autoxkit/android/control.py

@@ -0,0 +1,246 @@
+"""Control and device-message serializers for scrcpy-server v4.0."""
+
+from __future__ import annotations
+
+from .binary import (
+    ProtocolError,
+    float_to_i16fp,
+    float_to_u16fp,
+    i16be,
+    i32be,
+    read_u16be,
+    read_u32be,
+    read_u64be,
+    string8,
+    string32,
+    u16be,
+    u32be,
+    u64be,
+)
+from .models import ControlMessage, ControlMessageType, DeviceMessage, DeviceMessageType, Position
+
+MESSAGE_MAX_SIZE = 1 << 18
+INJECT_TEXT_MAX_LENGTH = 300
+CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 14
+
+ACTION_DOWN = 0
+ACTION_UP = 1
+ACTION_MOVE = 2
+
+POINTER_ID_MOUSE = -1 & 0xFFFFFFFFFFFFFFFF
+POINTER_ID_GENERIC_FINGER = -2 & 0xFFFFFFFFFFFFFFFF
+MAX_TOUCH_POINTERS = 10
+
+
+class PointerManager:
+    """Manages a pool of unique pointer IDs for multi-touch.
+
+    Allocates pointer IDs from 0 upward, up to `MAX_TOUCH_POINTERS`
+    concurrent touches. IDs are reused when released.
+    """
+
+    def __init__(self) -> None:
+        self._next_id = 0
+        self._freed: list[int] = []
+        self._active: set[int] = set()
+
+    def allocate(self) -> int | None:
+        """Allocate a unique pointer ID.
+
+        Returns an integer pointer ID, or `None` if the maximum number
+        of concurrent touches (`MAX_TOUCH_POINTERS`) has been reached.
+        """
+        if len(self._active) >= MAX_TOUCH_POINTERS:
+            return None
+        if self._freed:
+            pid = self._freed.pop()
+        else:
+            pid = self._next_id
+            self._next_id += 1
+        self._active.add(pid)
+        return pid
+
+    def release(self, pointer_id: int) -> None:
+        """Release a previously allocated pointer ID back to the pool."""
+        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."""
+        self._active.clear()
+        self._freed.clear()
+        self._next_id = 0
+
+    def active_count(self) -> int:
+        """Return the number of currently active pointer IDs."""
+        return len(self._active)
+
+    def active_ids(self) -> set[int]:
+        """Return the set of currently active pointer IDs."""
+        return set(self._active)
+
+
+
+
+def _position(position: Position) -> bytes:
+    return (
+        i32be(position.x)
+        + i32be(position.y)
+        + u16be(position.screen_width)
+        + u16be(position.screen_height)
+    )
+
+
+def inject_keycode(action: int, keycode: int, repeat: int = 0, metastate: int = 0) -> ControlMessage:
+    payload = (
+        bytes([ControlMessageType.INJECT_KEYCODE, action])
+        + i32be(keycode)
+        + u32be(repeat)
+        + u32be(metastate)
+    )
+    return ControlMessage(ControlMessageType.INJECT_KEYCODE, payload)
+
+
+def inject_text(text: str) -> ControlMessage:
+    payload = bytes([ControlMessageType.INJECT_TEXT]) + string32(text, INJECT_TEXT_MAX_LENGTH)
+    return ControlMessage(ControlMessageType.INJECT_TEXT, payload)
+
+
+def inject_touch_event(
+    action: int,
+    position: Position,
+    pointer_id: int = POINTER_ID_GENERIC_FINGER,
+    pressure: float = 1.0,
+    action_button: int = 0,
+    buttons: int = 0,
+) -> ControlMessage:
+    payload = (
+        bytes([ControlMessageType.INJECT_TOUCH_EVENT, action])
+        + u64be(pointer_id)
+        + _position(position)
+        + u16be(float_to_u16fp(pressure))
+        + u32be(action_button)
+        + u32be(buttons)
+    )
+    return ControlMessage(ControlMessageType.INJECT_TOUCH_EVENT, payload)
+
+
+def inject_scroll_event(position: Position, hscroll: float = 0.0, vscroll: float = 0.0, buttons: int = 0) -> ControlMessage:
+    h = float_to_i16fp(hscroll / 16)
+    v = float_to_i16fp(vscroll / 16)
+    payload = (
+        bytes([ControlMessageType.INJECT_SCROLL_EVENT])
+        + _position(position)
+        + i16be(h)
+        + i16be(v)
+        + u32be(buttons)
+    )
+    return ControlMessage(ControlMessageType.INJECT_SCROLL_EVENT, payload)
+
+
+def back_or_screen_on(action: int) -> ControlMessage:
+    return ControlMessage(ControlMessageType.BACK_OR_SCREEN_ON, bytes([ControlMessageType.BACK_OR_SCREEN_ON, action]))
+
+
+def get_clipboard(copy_key: int = 0) -> ControlMessage:
+    return ControlMessage(ControlMessageType.GET_CLIPBOARD, bytes([ControlMessageType.GET_CLIPBOARD, copy_key]))
+
+
+def set_clipboard(sequence: int, text: str, paste: bool = False) -> ControlMessage:
+    payload = (
+        bytes([ControlMessageType.SET_CLIPBOARD])
+        + u64be(sequence)
+        + bytes([1 if paste else 0])
+        + string32(text, CLIPBOARD_TEXT_MAX_LENGTH)
+    )
+    return ControlMessage(ControlMessageType.SET_CLIPBOARD, payload)
+
+
+def set_display_power(on: bool) -> ControlMessage:
+    return ControlMessage(ControlMessageType.SET_DISPLAY_POWER, bytes([ControlMessageType.SET_DISPLAY_POWER, int(on)]))
+
+
+def empty(message_type: ControlMessageType) -> ControlMessage:
+    if message_type not in {
+        ControlMessageType.EXPAND_NOTIFICATION_PANEL,
+        ControlMessageType.EXPAND_SETTINGS_PANEL,
+        ControlMessageType.COLLAPSE_PANELS,
+        ControlMessageType.ROTATE_DEVICE,
+        ControlMessageType.OPEN_HARD_KEYBOARD_SETTINGS,
+        ControlMessageType.RESET_VIDEO,
+        ControlMessageType.CAMERA_ZOOM_IN,
+        ControlMessageType.CAMERA_ZOOM_OUT,
+    }:
+        raise ValueError(f"{message_type.name} is not an empty control message")
+    return ControlMessage(message_type, bytes([message_type]))
+
+
+def camera_set_torch(on: bool) -> ControlMessage:
+    return ControlMessage(ControlMessageType.CAMERA_SET_TORCH, bytes([ControlMessageType.CAMERA_SET_TORCH, int(on)]))
+
+
+def resize_display(width: int, height: int) -> ControlMessage:
+    payload = bytes([ControlMessageType.RESIZE_DISPLAY]) + u16be(width) + u16be(height)
+    return ControlMessage(ControlMessageType.RESIZE_DISPLAY, payload)
+
+
+def start_app(name: str) -> ControlMessage:
+    payload = bytes([ControlMessageType.START_APP]) + string8(name, 255)
+    return ControlMessage(ControlMessageType.START_APP, payload)
+
+
+def uhid_create(uhid_id: int, vendor_id: int, product_id: int, name: str, report_desc: bytes) -> ControlMessage:
+    payload = (
+        bytes([ControlMessageType.UHID_CREATE])
+        + u16be(uhid_id)
+        + u16be(vendor_id)
+        + u16be(product_id)
+        + string8(name, 127)
+        + u16be(len(report_desc))
+        + report_desc
+    )
+    return ControlMessage(ControlMessageType.UHID_CREATE, payload)
+
+
+def uhid_input(uhid_id: int, data: bytes) -> ControlMessage:
+    payload = bytes([ControlMessageType.UHID_INPUT]) + u16be(uhid_id) + u16be(len(data)) + data
+    return ControlMessage(ControlMessageType.UHID_INPUT, payload)
+
+
+def uhid_destroy(uhid_id: int) -> ControlMessage:
+    return ControlMessage(ControlMessageType.UHID_DESTROY, bytes([ControlMessageType.UHID_DESTROY]) + u16be(uhid_id))
+
+
+def deserialize_device_message(buffer: bytes) -> tuple[DeviceMessage | None, int]:
+    if not buffer:
+        return None, 0
+    try:
+        message_type = DeviceMessageType(buffer[0])
+    except ValueError as exc:
+        raise ProtocolError(f"unknown device message type: {buffer[0]}") from exc
+
+    if message_type is DeviceMessageType.CLIPBOARD:
+        if len(buffer) < 5:
+            return None, 0
+        size = read_u32be(buffer, 1)
+        total = 5 + size
+        if len(buffer) < total:
+            return None, 0
+        text = buffer[5:total].decode("utf-8")
+        return DeviceMessage(message_type, text=text), total
+
+    if message_type is DeviceMessageType.ACK_CLIPBOARD:
+        if len(buffer) < 9:
+            return None, 0
+        return DeviceMessage(message_type, sequence=read_u64be(buffer, 1)), 9
+
+    if len(buffer) < 5:
+        return None, 0
+    uhid_id = read_u16be(buffer, 1)
+    size = read_u16be(buffer, 3)
+    total = 5 + size
+    if len(buffer) < total:
+        return None, 0
+    return DeviceMessage(message_type, uhid_id=uhid_id, data=buffer[5:total]), total
+

{autoxkit-2.0.0 → autoxkit-2.1.0}/autoxkit/android/streams.py

@@ -1,4 +1,4 @@
-"""Async stream readers and writers for scrcpy-server v4.0."""
+"""Async stream readers and writers for scrcpy-server v4.0."""
 
 from __future__ import annotations
 
@@ -190,6 +190,7 @@ class ControlStream:
         self.reader = reader
         self.writer = writer
         self._device_buffer = bytearray()
+        self.pointer_manager: control.PointerManager | None = None
 
     async def send(self, message: control.ControlMessage) -> None:
         self.writer.write(message.payload)
@@ -213,6 +214,57 @@ class ControlStream:
         position = control.Position(x, y, screen_width, screen_height)
         await self.send(control.inject_touch_event(action, position, pointer_id, pressure, action_button, buttons))
 
+    async def send_touch_managed(
+        self,
+        action: int,
+        x: int,
+        y: int,
+        screen_width: int,
+        screen_height: int,
+        pointer_id: int | None = None,
+        pressure: float = 1.0,
+        action_button: int = 0,
+        buttons: int = 0,
+    ) -> int | None:
+        """Send a touch event with automatic pointer ID management.
+
+        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).
+
+        On ``ACTION_UP``: the given *pointer_id* is released back to
+        the pool after sending.
+
+        When ``self.pointer_manager`` is ``None``, falls back to the
+        default ``POINTER_ID_GENERIC_FINGER``.
+        """
+        pm = self.pointer_manager
+
+        if action == control.ACTION_DOWN:
+            if pm is not None and pointer_id is None:
+                pid = pm.allocate()
+                if pid is None:
+                    return None
+            elif pointer_id is not None:
+                pid = pointer_id
+            else:
+                pid = control.POINTER_ID_GENERIC_FINGER
+            await self.send_touch(action, x, y, screen_width, screen_height, pointer_id=pid, pressure=pressure, action_button=action_button, buttons=buttons)
+            return pid
+
+        elif action == control.ACTION_UP:
+            pid = pointer_id if pointer_id is not None else control.POINTER_ID_GENERIC_FINGER
+            await self.send_touch(action, x, y, screen_width, screen_height, pointer_id=pid, pressure=pressure, action_button=action_button, buttons=buttons)
+            if pm is not None and pointer_id is not None:
+                pm.release(pid)
+            return pid
+
+        # ACTION_MOVE: just forward, no lifecycle management
+        pid = pointer_id if pointer_id is not None else control.POINTER_ID_GENERIC_FINGER
+        await self.send_touch(action, x, y, screen_width, screen_height, pointer_id=pid, pressure=pressure, action_button=action_button, buttons=buttons)
+        return None
+
+
     async def set_clipboard(self, text: str, sequence: int = 1, paste: bool = False) -> None:
         await self.send(control.set_clipboard(sequence, text, paste))
 
@@ -277,3 +329,5 @@ class AudioVideoCombinedStream:
         finally:
             for task in tasks:
                 task.cancel()
+
+

{autoxkit-2.0.0 → autoxkit-2.1.0}/autoxkit/hook/hook_listener.py

@@ -277,8 +277,9 @@ class HookListener:
                     user32.TranslateMessage(byref(msg))
                     user32.DispatchMessageW(byref(msg))
             except Exception:
-                # 出现异常直接跳出循环，保证能清理钩子
-                break
+                # 记录异常但不退出循环，确保钩子持续工作
+                # 回调中的异常应由上层自行处理
+                continue
 
         # 离开循环之前确保取消钩子
         if self.keyboard_hook:

{autoxkit-2.0.0 → autoxkit-2.1.0}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.0.0
+Version: 2.1.0
 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.0.0 → autoxkit-2.1.0}/autoxkit.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ autoxkit/android/adb.py
 autoxkit/android/binary.py
 autoxkit/android/client.py
 autoxkit/android/control.py
+autoxkit/android/control_backup.py
 autoxkit/android/models.py
 autoxkit/android/streams.py
 autoxkit/hook/__init__.py

{autoxkit-2.0.0 → autoxkit-2.1.0}/pyproject.toml

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