autoglm-gui 1.4.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

AutoGLM_GUI/socketio_server.py

@@ -4,7 +4,8 @@ from __future__ import annotations
 
 import asyncio
 import time
-from typing import Any
+
+from typing_extensions import NotRequired, TypedDict
 
 import socketio
 
@@ -12,13 +13,26 @@ from AutoGLM_GUI.logger import logger
 from AutoGLM_GUI.scrcpy_protocol import ScrcpyMediaStreamPacket
 from AutoGLM_GUI.scrcpy_stream import ScrcpyStreamer
 
+
+class VideoPacketPayload(TypedDict):
+    type: str
+    data: bytes
+    timestamp: int
+    keyframe: NotRequired[bool | None]
+    pts: NotRequired[int | None]
+
+
 sio = socketio.AsyncServer(
     async_mode="asgi",
     cors_allowed_origins="*",
+    server_kwargs={"socketio_path": "/socket.io"},
 )
 
 _socket_streamers: dict[str, ScrcpyStreamer] = {}
 _stream_tasks: dict[str, asyncio.Task] = {}
+_device_locks: dict[
+    str, asyncio.Lock
+] = {}  # Lock per device to prevent concurrent connections
 
 
 async def _stop_stream_for_sid(sid: str) -> None:
@@ -31,6 +45,46 @@ async def _stop_stream_for_sid(sid: str) -> None:
         streamer.stop()
 
 
+def _classify_error(exc: Exception) -> dict:
+    """Classify error and return user-friendly message."""
+    error_str = str(exc)
+
+    if "Address already in use" in error_str or (
+        "Port" in error_str and "occupied" in error_str
+    ):
+        return {
+            "message": "端口冲突，视频流端口仍被占用。通常会自动解决，如果持续出现请重启应用。",
+            "type": "port_conflict",
+            "technical_details": error_str,
+        }
+    elif "Device" in error_str and (
+        "not available" in error_str or "not found" in error_str
+    ):
+        return {
+            "message": "设备无响应，请检查 USB/WiFi 连接。",
+            "type": "device_offline",
+            "technical_details": error_str,
+        }
+    elif "timeout" in error_str.lower() or "timed out" in error_str.lower():
+        return {
+            "message": "连接超时，请检查设备连接后重试。",
+            "type": "timeout",
+            "technical_details": error_str,
+        }
+    elif "Failed to connect" in error_str:
+        return {
+            "message": "无法连接到 scrcpy 服务器，请检查设备连接。",
+            "type": "connection_failed",
+            "technical_details": error_str,
+        }
+    else:
+        return {
+            "message": error_str,
+            "type": "unknown",
+            "technical_details": error_str,
+        }
+
+
 def stop_streamers(device_id: str | None = None) -> None:
     """Stop active scrcpy streamers (all or by device)."""
     sids = list(_socket_streamers.keys())
@@ -64,8 +118,8 @@ async def _stream_packets(sid: str, streamer: ScrcpyStreamer) -> None:
         await _stop_stream_for_sid(sid)
 
 
-def _packet_to_payload(packet: ScrcpyMediaStreamPacket) -> dict[str, Any]:
-    payload: dict[str, Any] = {
+def _packet_to_payload(packet: ScrcpyMediaStreamPacket) -> VideoPacketPayload:
+    payload: VideoPacketPayload = {
         "type": packet.type,
         "data": packet.data,
         "timestamp": int(time.time() * 1000),
@@ -87,39 +141,70 @@ async def disconnect(sid: str) -> None:
     await _stop_stream_for_sid(sid)
 
 
-@sio.on("connect-device")
+@sio.on("connect-device")  # type: ignore[misc]
 async def connect_device(sid: str, data: dict | None) -> None:
     payload = data or {}
     device_id = payload.get("device_id") or payload.get("deviceId")
+    if not device_id:
+        await sio.emit(
+            "error",
+            {"message": "Device ID is required", "type": "invalid_request"},
+            to=sid,
+        )
+        return
+
     max_size = int(payload.get("maxSize") or 1280)
     bit_rate = int(payload.get("bitRate") or 4_000_000)
 
+    # Stop any existing stream for this sid
     await _stop_stream_for_sid(sid)
 
-    streamer = ScrcpyStreamer(
-        device_id=device_id,
-        max_size=max_size,
-        bit_rate=bit_rate,
-    )
-
-    try:
-        await streamer.start()
-        metadata = await streamer.read_video_metadata()
-        await sio.emit(
-            "video-metadata",
-            {
-                "deviceName": metadata.device_name,
-                "width": metadata.width,
-                "height": metadata.height,
-                "codec": metadata.codec,
-            },
-            to=sid,
+    # Get or create a lock for this device
+    if device_id not in _device_locks:
+        _device_locks[device_id] = asyncio.Lock()
+
+    device_lock = _device_locks[device_id]
+
+    # Acquire lock to prevent concurrent connections to the same device
+    async with device_lock:
+        logger.debug(f"Acquired device lock for {device_id}, sid: {sid}")
+
+        # Stop any existing streams for the same device (from other sids)
+        sids_to_stop = [
+            s
+            for s, streamer in _socket_streamers.items()
+            if s != sid and streamer.device_id == device_id
+        ]
+        for s in sids_to_stop:
+            logger.info(f"Stopping existing stream for device {device_id} from sid {s}")
+            await _stop_stream_for_sid(s)
+
+        streamer = ScrcpyStreamer(
+            device_id=device_id,
+            max_size=max_size,
+            bit_rate=bit_rate,
         )
-    except Exception as exc:
-        streamer.stop()
-        logger.exception("Failed to start scrcpy stream: %s", exc)
-        await sio.emit("error", {"message": str(exc)}, to=sid)
-        return
 
-    _socket_streamers[sid] = streamer
-    _stream_tasks[sid] = asyncio.create_task(_stream_packets(sid, streamer))
+        try:
+            await streamer.start()  # ScrcpyStreamer has built-in retry logic
+            metadata = await streamer.read_video_metadata()
+            await sio.emit(
+                "video-metadata",
+                {
+                    "deviceName": metadata.device_name,
+                    "width": metadata.width,
+                    "height": metadata.height,
+                    "codec": metadata.codec,
+                },
+                to=sid,
+            )
+
+            _socket_streamers[sid] = streamer
+            _stream_tasks[sid] = asyncio.create_task(_stream_packets(sid, streamer))
+
+        except Exception as exc:
+            streamer.stop()
+            logger.exception("Failed to start scrcpy stream: %s", exc)
+            # Use unified error classification
+            error_info = _classify_error(exc)
+            await sio.emit("error", error_info, to=sid)

AutoGLM_GUI/state.py

@@ -1,4 +1,13 @@
-"""Shared runtime state for the AutoGLM-GUI API."""
+"""Shared runtime state for the AutoGLM-GUI API.
+
+NOTE: Agent instances and configurations are now managed internally
+by PhoneAgentManager singleton. This module only contains:
+- scrcpy_streamers: Video streaming state per device
+- scrcpy_locks: Async locks for stream management
+- non_blocking_takeover: Takeover callback handler
+
+See PhoneAgentManager (phone_agent_manager.py) for agent lifecycle management.
+"""
 
 from __future__ import annotations
 
@@ -6,38 +15,9 @@ import asyncio
 from typing import TYPE_CHECKING
 
 from AutoGLM_GUI.logger import logger
-from phone_agent.agent import AgentConfig
-from phone_agent.model import ModelConfig
 
 if TYPE_CHECKING:
     from AutoGLM_GUI.scrcpy_stream import ScrcpyStreamer
-    from phone_agent import PhoneAgent
-
-# Agent instances keyed by device_id
-#
-# IMPORTANT: Managed by PhoneAgentManager (AutoGLM_GUI/phone_agent_manager.py)
-# - Do NOT directly modify these dictionaries
-# - Use PhoneAgentManager.get_instance() for all agent operations
-#
-# device_id changes when connection method changes
-# (e.g., USB "ABC123" → WiFi "192.168.1.100:5555")
-#
-# This means the same physical device may have different device_ids:
-#   - USB connection: device_id = hardware serial (e.g., "ABC123DEF")
-#   - WiFi connection: device_id = IP:port (e.g., "192.168.1.100:5555")
-#   - mDNS connection: device_id = service name (e.g., "adb-ABC123._adb-tls-connect._tcp")
-#
-# DeviceManager tracks devices by hardware serial and maintains
-# device_id ↔ serial mapping. Use PhoneAgentManager.find_agent_by_serial()
-# to find agents when device_id changes.
-#
-# See CLAUDE.md "Device Identification" section for details.
-agents: dict[str, "PhoneAgent"] = {}
-
-# Cached configs to rebuild agents on reset
-# Keyed by device_id (same semantics as agents dict)
-# IMPORTANT: Managed by PhoneAgentManager - do NOT modify directly
-agent_configs: dict[str, tuple[ModelConfig, AgentConfig]] = {}
 
 # Scrcpy streaming per device
 scrcpy_streamers: dict[str, "ScrcpyStreamer"] = {}

AutoGLM_GUI/static/assets/{about-DeclntHg.js → about-BQm96DAl.js}

@@ -1 +1 @@
-import{j as o}from"./index-DHF1NZh0.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};
+import{j as o}from"./index-CssG-3TH.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};

AutoGLM_GUI/static/assets/alert-dialog-B42XxGPR.js

@@ -0,0 +1 @@
+import{o as u,r as o,j as a,b as r,B as d}from"./index-CssG-3TH.js";import{P as g,b as x,c as f,d as m}from"./popover-DLsuV5Sx.js";import{D as p,d as h,e as w,f as j,g as D}from"./dialog-DZ78cEcj.js";const N=[["path",{d:"M20 6 9 17l-5-5",key:"1gmf2c"}]],b=u("check",N),c=o.createContext(void 0),P=({value:t="",onValueChange:e,children:s})=>{const[n,l]=o.useState(!1);return a.jsx(c.Provider,{value:{value:t,onValueChange:e||(()=>{}),open:n,setOpen:l},children:a.jsx(g,{open:n,onOpenChange:l,children:s})})},C=o.forwardRef(({className:t,children:e,...s},n)=>{if(!o.useContext(c))throw new Error("SelectTrigger must be used within Select");return a.jsx(x,{asChild:!0,children:a.jsxs("button",{ref:n,className:r("flex h-10 w-full items-center justify-between rounded-md border border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-slate-950 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus:ring-slate-300",t),...s,children:[e,a.jsx(f,{className:"h-4 w-4 opacity-50"})]})})});C.displayName="SelectTrigger";const V=({placeholder:t})=>{const e=o.useContext(c);if(!e)throw new Error("SelectValue must be used within Select");return a.jsx("span",{className:e.value?"":"text-slate-500",children:e.value||t})},I=({children:t,className:e})=>a.jsx(m,{className:r("w-[var(--radix-popover-trigger-width)] p-1",e),children:t}),O=({value:t,children:e,disabled:s,className:n})=>{const l=o.useContext(c);if(!l)throw new Error("SelectItem must be used within Select");const i=l.value===t;return a.jsxs("div",{role:"option","aria-selected":i,className:r("relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none hover:bg-slate-100 focus:bg-slate-100 dark:hover:bg-slate-800 dark:focus:bg-slate-800",s&&"pointer-events-none opacity-50",n),onClick:()=>{s||(l.onValueChange(t),l.setOpen(!1))},children:[a.jsx("span",{className:"absolute left-2 flex h-3.5 w-3.5 items-center justify-center",children:i&&a.jsx(b,{className:"h-4 w-4"})}),e]})},B=({open:t,onOpenChange:e,children:s})=>a.jsx(p,{open:t,onOpenChange:e,children:s}),v=o.forwardRef(({className:t,...e},s)=>a.jsx(h,{ref:s,className:r("sm:max-w-[425px]",t),...e}));v.displayName="AlertDialogContent";const F=({className:t,...e})=>a.jsx(w,{className:r(t),...e}),H=({className:t,...e})=>a.jsx(D,{className:r(t),...e}),A=o.forwardRef(({className:t,...e},s)=>a.jsx(j,{ref:s,className:r(t),...e}));A.displayName="AlertDialogTitle";const S=o.forwardRef(({className:t,...e},s)=>a.jsx("p",{ref:s,className:r("text-sm text-slate-500 dark:text-slate-400",t),...e}));S.displayName="AlertDialogDescription";const y=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,className:r(t),...e}));y.displayName="AlertDialogAction";const k=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,variant:"outline",className:r(t),...e}));k.displayName="AlertDialogCancel";export{B as A,P as S,C as a,V as b,I as c,O as d,v as e,F as f,A as g,S as h,H as i,k as j,y as k};