offline mode add --server-url (#58)

* support specify server url in offline mode

* remove unsafe /proxy/http

* Update uiautodev/cli.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: codeskyblue

DEVELOP.md

@@ -32,31 +32,10 @@ make dev
 # 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
-```
-
-## 代理转发
-
-由于服务端是写在https外部网站上的，访问非localhost的http服务时会由于安全问题，禁止访问。
-比如A机器访问B机器的服务，就不行。
-所以需要本地转发，才能连接到其他的uiautodev客户端上。
-
-测试WebSocket转发
-
-```sh
-wscat -c "ws://localhost:20242/proxy/ws/wss://echo.websocket.events"
-```
-
-> npm i -g wscat
-
-测试HTTP转发
-
-```sh
-curl http://localhost:20242/proxy/http/https://httpbin.org/get
-```
+```

README.md

@@ -55,6 +55,9 @@ Start with
 
 ```sh
 uiautodev server --offline
+
+# Specify server url (optional)
+uiautodev server --offline --server-url https://uiauto.dev
 ```
 
 Visit <http://localhost:20242> once, and then disconnecting from the internet will not affect usage.

uiautodev/cli.py

@@ -150,10 +150,11 @@ def pip_install(package: str):
 @click.option("--port", default=20242, help="port number", show_default=True)
 @click.option("--host", default="127.0.0.1", help="host", show_default=True)
 @click.option("--reload", is_flag=True, default=False, help="auto reload, dev only")
-@click.option("-f", "--force", is_flag=True, default=False, help="shutdown alrealy runningserver")
+@click.option("-f", "--force", is_flag=True, default=False, help="shutdown already running server")
 @click.option("-s", "--no-browser", is_flag=True, default=False, help="silent mode, do not open browser")
 @click.option("--offline", is_flag=True, default=False, help="offline mode, do not use internet")
-def server(port: int, host: str, reload: bool, force: bool, no_browser: bool, offline: bool):
+@click.option("--server-url", default="https://uiauto.dev", help="uiauto.dev server url", show_default=True)
+def server(port: int, host: str, reload: bool, force: bool, no_browser: bool, offline: bool, server_url: str):
     click.echo(f"uiautodev version: {__version__}")
     if force:
         try:
@@ -165,10 +166,13 @@ def server(port: int, host: str, reload: bool, force: bool, no_browser: bool, of
     if platform.system() == 'Windows':
         use_color = False
 
+    server_url = server_url.rstrip('/')
+    from uiautodev.router import proxy
+    proxy.base_url = server_url
+
     if offline:
-        from uiautodev.router.proxy import cache_dir
-        cache_dir.mkdir(parents=True, exist_ok=True)
-        logger.info("offline mode enabled, cache dir: %s", cache_dir)
+        proxy.cache_dir.mkdir(parents=True, exist_ok=True)
+        logger.info("offline mode enabled, cache dir: %s, server url: %s", proxy.cache_dir, proxy.base_url)
 
     if not no_browser:
         th = threading.Thread(target=open_browser_when_server_start, args=(f"http://{host}:{port}", offline))

uiautodev/router/proxy.py

@@ -7,48 +7,30 @@
 
 import httpx
 import websockets
-from fastapi import APIRouter, BackgroundTasks, HTTPException, Request, WebSocket, WebSocketDisconnect
+from fastapi import APIRouter, Request, WebSocket, WebSocketDisconnect
 from fastapi.responses import Response, StreamingResponse
 from starlette.background import BackgroundTask
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
 cache_dir = Path("./cache")
-
-# HTTP 转发
-@router.api_route("/proxy/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() if request.method in {"POST", "PUT", "PATCH", "DELETE"} else None
-        headers = {k: v for k, v in request.headers.items() if k.lower() not in {"host", "x-target-url"}}
-        headers['accept-encoding'] = ''  # disable gzip
-        resp = await client.request(
-            request.method,
-            target_url,
-            content=body,
-            headers=headers,
-        )
-        return Response(content=resp.content, status_code=resp.status_code, headers=dict(resp.headers))
-
+base_url = 'https://uiauto.dev'
 
 @router.get("/")
 @router.get("/android/{path:path}")
 @router.get("/ios/{path:path}")
 @router.get("/demo/{path:path}")
 @router.get("/harmony/{path:path}")
 async def proxy_html(request: Request):
-    target_url = "https://uiauto.dev/"
-    cache = HTTPCache(cache_dir, target_url, key='homepage')
+    cache = HTTPCache(cache_dir, base_url, key='homepage')
     response = await cache.proxy_request(request, update_cache=True)
     return response
     # update
 
 @router.get("/assets/{path:path}")
 @router.get('/favicon.ico')
 async def proxy_assets(request: Request, path: str = ""):
-    target_url = f"https://uiauto.dev{request.url.path}"
+    target_url = f"{base_url}{request.url.path}"
     cache = HTTPCache(cache_dir, target_url)
     return await cache.proxy_request(request)