uiautodev 0.9.0__tar.gz → 0.10.0__tar.gz

{uiautodev-0.9.0 → uiautodev-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uiautodev
-Version: 0.9.0
+Version: 0.10.0
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
 License: MIT
 Author: codeskyblue
@@ -18,7 +18,7 @@ Requires-Dist: Pillow
 Requires-Dist: adbutils (>=2.8.10,<3)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: construct
-Requires-Dist: fastapi (==0.115.12)
+Requires-Dist: fastapi (>=0.115.12,<1)
 Requires-Dist: httpx
 Requires-Dist: lxml
 Requires-Dist: pydantic (>=2.6,<3.0)
@@ -76,31 +76,8 @@ uiauto.dev
 ```
 
 # DEVELOP
-```bash
-# install poetry (python package manager)
-pip install poetry # pipx install poetry
-
-# install deps
-poetry install
-
-# format import
-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
-```
+see [DEVELOP.md](DEVELOP.md)
 
 # Links
 - https://app.tangoapp.dev/ 基于webadb的手机远程控制项目

{uiautodev-0.9.0 → uiautodev-0.10.0}/README.md

@@ -42,31 +42,8 @@ uiauto.dev
 ```
 
 # DEVELOP
-```bash
-# install poetry (python package manager)
-pip install poetry # pipx install poetry
-
-# install deps
-poetry install
-
-# format import
-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
-```
+see [DEVELOP.md](DEVELOP.md)
 
 # Links
 - https://app.tangoapp.dev/ 基于webadb的手机远程控制项目

{uiautodev-0.9.0 → uiautodev-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiautodev"
-version = "0.9.0"
+version = "0.10.0"
 description = "Mobile UI Automation, include UI hierarchy inspector, script recorder"
 homepage = "https://uiauto.dev"
 authors = ["codeskyblue <codeskyblue@gmail.com>"]
@@ -17,7 +17,7 @@ adbutils = ">=2.8.10,<3"
 click = "^8.1.7"
 pygments = ">=2"
 uiautomator2 = ">=3.2.0,<4"
-fastapi = "0.115.12"
+fastapi = ">=0.115.12,<1"
 pydantic = "^2.6"
 wdapy = ">0.2.2,<1"
 websockets = ">=10.4"

{uiautodev-0.9.0 → uiautodev-0.10.0}/uiautodev/__init__.py

@@ -5,4 +5,4 @@
 """
 
 # version is auto managed by poetry
-__version__ = "0.9.0"
+__version__ = "0.10.0"

{uiautodev-0.9.0 → uiautodev-0.10.0}/uiautodev/app.py

@@ -27,6 +27,7 @@ from uiautodev.provider import AndroidProvider, HarmonyProvider, IOSProvider, Mo
 from uiautodev.remote.scrcpy import ScrcpyServer
 from uiautodev.router.android import router as android_device_router
 from uiautodev.router.device import make_router
+from uiautodev.router.proxy import router as proxy_router
 from uiautodev.router.xml import router as xml_router
 from uiautodev.utils.envutils import Environment
 
@@ -70,7 +71,7 @@ else:
 
 app.include_router(xml_router, prefix="/api/xml", tags=["xml"])
 app.include_router(android_device_router, prefix="/api/android", tags=["android"])
-
+app.include_router(proxy_router, prefix="/proxy", tags=["proxy"])
 
 @app.get('/api/{platform}/features')
 def get_features(platform: str) -> Dict[str, bool]:

uiautodev-0.10.0/uiautodev/router/proxy.py

@@ -0,0 +1,58 @@
+import asyncio
+
+import httpx
+import websockets
+from fastapi import APIRouter, HTTPException, Request, WebSocket, WebSocketDisconnect
+from fastapi.responses import Response
+import logging
+
+
+logger = logging.getLogger(__name__)
+router = APIRouter()
+
+
+# HTTP 转发
+@router.api_route("/http/{target_url:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"])
+async def proxy_http(request: Request, target_url: str):
+    logger.info(f"HTTP target_url: {target_url}")
+
+    async with httpx.AsyncClient(timeout=httpx.Timeout(30.0)) as client:
+        body = await request.body()
+        resp = await client.request(
+            request.method,
+            target_url,
+            content=body,
+            headers={k: v for k, v in request.headers.items() if k.lower() != "host" and k.lower() != "x-target-url"}
+        )
+        return Response(content=resp.content, status_code=resp.status_code, headers=dict(resp.headers))
+
+# WebSocket 转发
+@router.websocket("/ws/{target_url:path}")
+async def proxy_ws(websocket: WebSocket, target_url: str):
+    await websocket.accept()
+    logger.info(f"WebSocket target_url: {target_url}")
+
+    try:
+        async with websockets.connect(target_url) as target_ws:
+            async def from_client():
+                while True:
+                    msg = await websocket.receive_text()
+                    await target_ws.send(msg)
+
+            async def from_server():
+                while True:
+                    msg = await target_ws.recv()
+                    if isinstance(msg, bytes):
+                        await websocket.send_bytes(msg)
+                    elif isinstance(msg, str):
+                        await websocket.send_text(msg)
+                    else:
+                        raise RuntimeError("Unknown message type", msg)
+
+            await asyncio.gather(from_client(), from_server())
+
+    except WebSocketDisconnect:
+        pass
+    except Exception as e:
+        logger.error(f"WS Error: {e}")
+        await websocket.close()