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

uiautodev/remote/touch_controller.py

@@ -0,0 +1,123 @@
+import enum
+import socket
+import struct
+
+from construct import Byte, Int16ub, Int32ub, Int64ub, Struct
+
+from uiautodev.remote.android_input import KeyeventAction, MetaState
+from uiautodev.remote.keycode import KeyCode
+
+
+# https://github.com/Genymobile/scrcpy/blob/master/app/src/control_msg.h#L29
+class MessageType(enum.IntEnum):
+    INJECT_KEYCODE = 0
+    INJECT_TEXT = 1
+    INJECT_TOUCH_EVENT = 2
+    INJECT_SCROLL_EVENT = 3
+    BACK_OR_SCREEN_ON = 4
+    EXPAND_NOTIFICATION_PANEL = 5
+    EXPAND_SETTINGS_PANEL = 6
+    COLLAPSE_PANELS = 7
+    GET_CLIPBOARD = 8
+    SET_CLIPBOARD = 9
+    SET_DISPLAY_POWER = 10
+    ROTATE_DEVICE = 11
+    UHID_CREATE = 12
+    UHID_INPUT = 13
+    UHID_DESTROY = 14
+    OPEN_HARD_KEYBOARD_SETTINGS = 15
+    START_APP = 16
+    RESET_VIDEO = 17
+
+
+TouchEvent = Struct(
+    "type" / Byte,               # SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT
+    "action" / Byte,             # AKEY_EVENT_ACTION_DOWN
+    "pointer_id" / Int64ub,      # 8-byte pointer ID
+    "x" / Int32ub,               # X coordinate
+    "y" / Int32ub,               # Y coordinate
+    "width" / Int16ub,           # width
+    "height" / Int16ub,          # height
+    "pressure" / Int16ub,        # pressure
+    "action_button" / Int32ub,   # action button
+    "buttons" / Int32ub          # buttons
+)
+
+
+# Define the structure for key events
+KeyEvent = Struct(
+    "type" / Byte,               # SC_CONTROL_MSG_TYPE_INJECT_KEYCODE
+    "action" / Byte,             # AKEY_EVENT_ACTION (DOWN, UP, MULTIPLE)
+    "keycode" / Int32ub,         # Android keycode
+    "repeat" / Int32ub,          # Repeat count
+    "metastate" / Int32ub        # Meta state flags (SHIFT, ALT, etc.)
+)
+
+
+class ScrcpyTouchController:
+    """scrcpy控制类，支持scrcpy版本>=2.2"""
+
+    def __init__(self, control_socket: socket.socket):
+        self.control_socket = control_socket
+
+    def _build_touch_event(self, action: int, x: int, y: int, width: int, height: int):
+        x = max(0, min(x, width))
+        y = max(0, min(y, height))
+        return TouchEvent.build(dict(
+            type=MessageType.INJECT_TOUCH_EVENT,
+            action=action,
+            pointer_id=1,
+            x=x,
+            y=y,
+            width=width,
+            height=height,
+            pressure=1,
+            action_button=1, # AMOTION_EVENT_BUTTON_PRIMARY (action button)
+            buttons=1, # AMOTION_EVENT_BUTTON_PRIMARY (buttons)
+        ))
+
+    def down(self, x: int, y: int, width: int, height: int):
+        """发送down操作"""
+        data = self._build_touch_event(0, x, y, width, height)
+        self.control_socket.send(data)
+
+    def up(self, x: int, y: int, width: int, height: int):
+        """发送up操作"""
+        data = self._build_touch_event(1, x, y, width, height)
+        self.control_socket.send(data)
+
+    def move(self, x: int, y: int, width: int, height: int):
+        """发送move操作"""
+        data = self._build_touch_event(2, x, y, width, height)
+        self.control_socket.send(data)
+
+    def text(self, text: str):
+        """发送文本操作"""
+
+        # buffer = text.encode("utf-8")
+        # values = struct.pack(self.format_string, 2, 3, 1, len(buffer), 0, 0, 0, self.const_value,
+        #                      self.unknown1, self.unknown2) + buffer
+        # self.control_socket.send(values)
+        pass
+
+    def key(self, action: KeyeventAction, keycode: KeyCode, repeat: int, metastate: MetaState):
+        """
+        Send a keycode event to the Android device
+        
+        Args:
+            action: Key action (DOWN, UP, or MULTIPLE)
+            keycode: Android key code to send
+            repeat: Number of times the key is repeated
+            metastate: Meta state flags (SHIFT, ALT, etc.)
+        """
+        # Build the data using the KeyEvent structure
+        data = KeyEvent.build(dict(
+            type=MessageType.INJECT_KEYCODE,  # Type byte
+            action=action,                   # Action byte
+            keycode=keycode,                   # Keycode (4 bytes)
+            repeat=repeat,                   # Repeat count (4 bytes)
+            metastate=metastate,        # Meta state (4 bytes)
+        ))
+        
+        # Send the data to the control socket
+        self.control_socket.send(data)

uiautodev/router/device.py

@@ -28,7 +28,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
 
     @router.get("/list")
     def _list() -> List[DeviceInfo]:
-        """List of Android devices"""
+        """List devices"""
         try:
             return provider.list_devices()
         except NotImplementedError as e:
@@ -80,7 +80,8 @@ def make_router(provider: BaseProvider) -> APIRouter:
             else:
                 return Response(content=f"Invalid format: {format}", media_type="text/plain", status_code=400)
         except Exception as e:
-            logger.exception("dump_hierarchy failed")
+            #logger.exception("dump_hierarchy failed")
+            logger.error(f"Error dumping hierarchy: {str(e)}")
             return Response(content=str(e), media_type="text/plain", status_code=500)
     
     @router.post('/{serial}/command/tap')

uiautodev/utils/common.py

@@ -5,11 +5,12 @@ import json as sysjson
 import platform
 import re
 import socket
+import subprocess
 import sys
 import typing
 import uuid
 from http.client import HTTPConnection, HTTPResponse
-from typing import Optional, TypeVar, Union
+from typing import List, Optional, TypeVar, Union
 
 from pydantic import BaseModel
 from pygments import formatters, highlight, lexers
@@ -61,10 +62,11 @@ def print_json(buf, colored=None, default=default_json_encoder):
         print(colorful_json)
     else:
         print(formatted_json)
-    
+
 
 _T = TypeVar("_T")
 
+
 def convert_to_type(value: str, _type: _T) -> _T:
     """ usage example:
     convert_to_type("123", int)
@@ -78,9 +80,9 @@ def convert_to_type(value: str, _type: _T) -> _T:
     if _type == re.Pattern:
         return re.compile(value)
     raise NotImplementedError(f"convert {value} to {_type}")
-    
 
-def convert_params_to_model(params: list[str], model: BaseModel) -> BaseModel:
+
+def convert_params_to_model(params: List[str], model: BaseModel) -> BaseModel:
     """ used in cli.py """
     assert len(params) > 0
     if len(params) == 1:
@@ -114,7 +116,7 @@ class SocketHTTPConnection(HTTPConnection):
     def __init__(self, conn: socket.socket, timeout: float):
         super().__init__("localhost", timeout=timeout)
         self.__conn = conn
-        
+
     def connect(self):
         self.sock = self.__conn
 
@@ -131,7 +133,8 @@ class MySocketHTTPConnection(SocketHTTPConnection):
         self.sock.settimeout(self.timeout)
 
 
-def fetch_through_socket(sock: socket.socket, path: str, method: str = "GET", json: Optional[dict] = None, timeout: float = 60) -> bytearray:
+def fetch_through_socket(sock: socket.socket, path: str, method: str = "GET", json: Optional[dict] = None,
+                         timeout: float = 60) -> bytearray:
     """ usage example:
     with socket.create_connection((host, port)) as s:
         request_through_socket(s, "GET", "/")
@@ -163,4 +166,5 @@ def node_travel(node: Node, dfs: bool = True):
     for child in node.children:
         yield from node_travel(child, dfs)
     if dfs:
-        yield node
+        yield node
+

uiautodev/utils/envutils.py

@@ -0,0 +1,9 @@
+import os
+
+
+def is_enabled(name: str) -> bool:
+    return os.getenv(name, "false").lower() in ("true", "1", "on", "yes", "y")
+
+
+class Environment:
+    UIAUTODEV_MOCK = is_enabled("UIAUTODEV_MOCK")

{uiautodev-0.5.0.dist-info → uiautodev-0.7.0.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: uiautodev
-Version: 0.5.0
+Version: 0.7.0
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
-Home-page: https://uiauto.dev
 License: MIT
 Author: codeskyblue
 Author-email: codeskyblue@gmail.com
@@ -14,7 +13,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: adbutils (>=2.7.0,<3.0.0)
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: adbutils (>=2.8.10,<3)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: construct
 Requires-Dist: fastapi (>=0.111.0,<0.112.0)
@@ -27,6 +27,7 @@ Requires-Dist: pygments (>=2)
 Requires-Dist: uiautomator2 (>=2)
 Requires-Dist: uvicorn[standard]
 Requires-Dist: wdapy (>=0.2.2,<0.3.0)
+Project-URL: Homepage, https://uiauto.dev
 Description-Content-Type: text/markdown
 
 # uiautodev
@@ -79,6 +80,18 @@ make format
 
 # run server
 make dev
+
+# If you encounter the error NameError: name 'int2byte' is not defined,
+# try installing a stable version of the construct package to resolve it:
+# and restart: make dev
+pip install construct==2.9.45
+
+```
+
+运行测试
+
+```sh
+make test
 ```
 
 # LICENSE

uiautodev-0.7.0.dist-info/RECORD

@@ -0,0 +1,38 @@
+uiautodev/__init__.py,sha256=mTWKzvzN8eHwDcyb2IbYUtJ_o-BljuhJ03UOiHxpUdY,164
+uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
+uiautodev/app.py,sha256=dzylhfAId-GqjsyQuJznCNzn2NIK9WZ7PsiHhUrazvY,4615
+uiautodev/appium_proxy.py,sha256=yMzPnIDo50hYSaq0g5bXUpgRrFa_849wNa2o7ZpxGNY,1773
+uiautodev/binaries/scrcpy_server.jar,sha256=ojxWWfNsJg8QXAItJ7yz6v_6JgcOe6qe2mbQE3ehrbo,71200
+uiautodev/case.py,sha256=Jk2_5X2F-XIPnGuYTCqOVQiwwchwOhF7uKK5oKv5shg,3919
+uiautodev/cli.py,sha256=nqxVTaNkItIN5REGEgVPFr0JWxPmeIPz_tZvFQNU7Jc,5442
+uiautodev/command_proxy.py,sha256=C9z-dITMED4k5na45NMdEWAXlLh3Ll921mKuefFyk78,5226
+uiautodev/command_types.py,sha256=pWdnCS4FRnEIiR1ynd4cjXX8zeFndjPztacBlukt61E,1761
+uiautodev/common.py,sha256=1A0kXfxVrp_i5mc_aRjuqSDWFFZ7DwZR9qpRLu2GMMg,1488
+uiautodev/driver/android.py,sha256=ZdgMkcoyqleibHbPeg-9bDnpFx3KHBnQxhLZlnKOmbE,6344
+uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
+uiautodev/driver/base_driver.py,sha256=neoVS9T8MN5RXvW6vvqXSc6pcBW_fqujJurjUrlt0OA,2816
+uiautodev/driver/harmony.py,sha256=93pwlg04wazey8MQM6DEvcBkr52REYVw4bwz321fK38,8031
+uiautodev/driver/ios.py,sha256=EOi9k-Y4qQS6Htdz_ycBf5jYCnOkruB-mR0Sc8J-coo,4204
+uiautodev/driver/mock.py,sha256=0VtxBkZRMbHiQGHjqm8Ih2Ld6baXiVxX8yUTwWJQlnE,2422
+uiautodev/driver/testdata/layout.json,sha256=0z9jGJteXuGwkOhO_iINYPoDp1kCq-EaQds_iZkmiPQ,276538
+uiautodev/driver/udt/appium-uiautomator2-v5.12.4-light.apk,sha256=cKUVKpqEiGRXODeqpwzVWllyjdSLyowFm94a6jDTvhI,3675062
+uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8351
+uiautodev/exceptions.py,sha256=TuRD5SWQk5N2_KjrcDuXG_p84LBhLa2QEEXyFNFm0yQ,465
+uiautodev/model.py,sha256=hziSYyh7ufaKbQrMmRMcIVeZ0x-pwkLMHljrI-qu184,950
+uiautodev/provider.py,sha256=EnBI8PD2eoBjqugGS5cmy8GZ1Z7EaEF6YEQSfpOMN6s,2862
+uiautodev/remote/android_input.py,sha256=r9y2SxnDw0GhN44emL-2Nz0UasaVaVtzh53hd-LJ710,2445
+uiautodev/remote/keycode.py,sha256=RHSJVfcNY2pelQd7_tcE6T0j3n8CKBkiku7A2AJZUpk,8097
+uiautodev/remote/scrcpy.py,sha256=Iagm9RrdB67KC2fkyyzpCeHYT0VMSQhoBEks1R_bXpo,7380
+uiautodev/remote/touch_controller.py,sha256=dYl5XTLaYEyZiNJmKwHQpw9QhPSkN3iUetJSaiQJBHg,4255
+uiautodev/router/device.py,sha256=zYrxjVGjrz7Jw8G9KNO0su22OIiQDuuSHBDBDpC1PG8,4899
+uiautodev/router/xml.py,sha256=MKVLhjMBqE4qbEraQxvdrVp_OBnylEL9Wti5lnmBDk4,891
+uiautodev/static/demo.html,sha256=qC7qUZP5Af9T3V5EuFGbovzv8mArwiGMWsX_vcs_Bt0,1240
+uiautodev/utils/common.py,sha256=L1qBBBS6jRgkXlGy5o6Xafo49auLXKRWyX9x8U_IKjc,4821
+uiautodev/utils/envutils.py,sha256=Clyt2Hz9PXpK_fT0yWbMmixXyGvCaJO3LAgamM7aUVc,197
+uiautodev/utils/exceptions.py,sha256=lL_G_E41KWvfXnl32-E4Vgr3_HyTboxq_EwzdQMuvK4,637
+uiautodev/utils/usbmux.py,sha256=LYupLDn7U4KFKhYQJrmIroS-3040gqZQVDRDB_FNDJM,17386
+uiautodev-0.7.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.7.0.dist-info/METADATA,sha256=cQAcxwZTGA-_kMnh95lbcdwqfi1OqIUvJowagJ7E7xo,2607
+uiautodev-0.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+uiautodev-0.7.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.7.0.dist-info/RECORD,,

{uiautodev-0.5.0.dist-info → uiautodev-0.7.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

uiautodev-0.5.0.dist-info/RECORD

@@ -1,30 +0,0 @@
-uiautodev/__init__.py,sha256=uBLcbZ_b1lvAbHh0kXPeO4VWJvl-Zc4XvUMhg6PmzyY,164
-uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
-uiautodev/app.py,sha256=R7AV5uuh4VLkrF9Kl_JJWUiPQnuIeJ02CN1W7tNGPKE,2498
-uiautodev/appium_proxy.py,sha256=yMzPnIDo50hYSaq0g5bXUpgRrFa_849wNa2o7ZpxGNY,1773
-uiautodev/case.py,sha256=Jk2_5X2F-XIPnGuYTCqOVQiwwchwOhF7uKK5oKv5shg,3919
-uiautodev/cli.py,sha256=K4CEvGJSDWLAFR5tvls2Qp4evQ2lApLoUxA-4DI2-Sc,6235
-uiautodev/command_proxy.py,sha256=gP4oTCjA1uKteWq5NOcHQLrI34el0ag5LUHNEq_j7Ko,5280
-uiautodev/command_types.py,sha256=pWdnCS4FRnEIiR1ynd4cjXX8zeFndjPztacBlukt61E,1761
-uiautodev/common.py,sha256=t1jmG7S0LVXAigtg86J3vM2XXf1xYPfDV_HwSwyl3OI,552
-uiautodev/driver/android.py,sha256=aKx6mW0eUMejv2uItkvDQg6o5nxtAOJ3m0gqomRXC_g,6394
-uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
-uiautodev/driver/base_driver.py,sha256=8uo7DgEKfgW_wf-HpkmFxjNRkElpFEDjjg45Q2pgiWA,2816
-uiautodev/driver/ios.py,sha256=EOi9k-Y4qQS6Htdz_ycBf5jYCnOkruB-mR0Sc8J-coo,4204
-uiautodev/driver/mock.py,sha256=0VtxBkZRMbHiQGHjqm8Ih2Ld6baXiVxX8yUTwWJQlnE,2422
-uiautodev/driver/udt/appium-uiautomator2-v5.12.4-light.apk,sha256=cKUVKpqEiGRXODeqpwzVWllyjdSLyowFm94a6jDTvhI,3675062
-uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8351
-uiautodev/exceptions.py,sha256=TuRD5SWQk5N2_KjrcDuXG_p84LBhLa2QEEXyFNFm0yQ,465
-uiautodev/model.py,sha256=ij9Ct_OboSygyU_cQHoXzQ9czcwGogoezwXjyY-Cr0U,876
-uiautodev/provider.py,sha256=HDD_Jj-cJVfBceunzCYU9zJvGVya7Jd35GG9h85BY-0,2370
-uiautodev/router/device.py,sha256=9lLN7L1lExWUZ39uKz3fd56s3dkgdTfrKgcs9jQDD0I,4846
-uiautodev/router/xml.py,sha256=MKVLhjMBqE4qbEraQxvdrVp_OBnylEL9Wti5lnmBDk4,891
-uiautodev/static/demo.html,sha256=qC7qUZP5Af9T3V5EuFGbovzv8mArwiGMWsX_vcs_Bt0,1240
-uiautodev/utils/common.py,sha256=HuXJvipkg1QQg6vCD7OxH6JQtqbSVbXNzI1X2OVcEcU,4785
-uiautodev/utils/exceptions.py,sha256=lL_G_E41KWvfXnl32-E4Vgr3_HyTboxq_EwzdQMuvK4,637
-uiautodev/utils/usbmux.py,sha256=LYupLDn7U4KFKhYQJrmIroS-3040gqZQVDRDB_FNDJM,17386
-uiautodev-0.5.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.5.0.dist-info/METADATA,sha256=jcCkmA85d8iUEKD7yO-JbHnykMP-gkiSy6zHHCULv34,2310
-uiautodev-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiautodev-0.5.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.5.0.dist-info/RECORD,,