myagent-ai 1.47.30 → 1.47.31

package/core/vnc_manager.py

@@ -55,71 +55,7 @@ logger = get_logger("myagent.vnc")
 # ── 默认配置 ──────────────────────────────────────────────
 
 DEFAULT_DISPLAY = ":99"
-DEFAULT_XVFB_RESOLUTION = "1080x1920x24"  # [v1.47.3] 默认竖屏(手机)，旋转切换到横屏
-
-
-def _detect_android_screen_size() -> Optional[tuple]:
-    """[v1.47.29] 检测 Android 设备屏幕物理尺寸（宽x高，像素）。
-
-    优先级:
-      1. 环境变量 MYAGENT_SCREEN (用户手动指定，格式 "1097x550")
-      2. getprop ro.hardware.screen_width/height (部分 ROM)
-      3. /sys/class/graphics/fb0/virtual_size (内核帧缓冲区)
-      4. getprop qemu.sf.lcd_density + ro.sf.lcd_density 推算
-
-    Returns:
-        (width, height) 元组，检测失败返回 None
-    """
-    # 1. 环境变量
-    env_screen = os.environ.get("MYAGENT_SCREEN", "").strip()
-    if env_screen and "x" in env_screen:
-        try:
-            parts = env_screen.lower().split("x")
-            w, h = int(parts[0]), int(parts[1])
-            if w > 0 and h > 0:
-                logger.info(f"屏幕尺寸来自环境变量 MYAGENT_SCREEN: {w}x{h}")
-                return (w, h)
-        except (ValueError, IndexError):
-            pass
-
-    # 2. getprop 属性（部分 ROM 有 ro.hardware.screen_width/height）
-    try:
-        result_w = subprocess.run(
-            ["getprop", "ro.hardware.screen_width"],
-            capture_output=True, text=True, timeout=3,
-        )
-        result_h = subprocess.run(
-            ["getprop", "ro.hardware.screen_height"],
-            capture_output=True, text=True, timeout=3,
-        )
-        if result_w.returncode == 0 and result_h.returncode == 0:
-            sw = result_w.stdout.strip()
-            sh = result_h.stdout.strip()
-            if sw and sh and sw.isdigit() and sh.isdigit():
-                w, h = int(sw), int(sh)
-                if w > 0 and h > 0:
-                    logger.info(f"屏幕尺寸来自 getprop: {w}x{h}")
-                    return (w, h)
-    except Exception:
-        pass
-
-    # 3. 内核帧缓冲区尺寸
-    fb_path = "/sys/class/graphics/fb0/virtual_size"
-    try:
-        if os.path.exists(fb_path):
-            with open(fb_path, "r") as f:
-                content = f.read().strip()
-            # 格式通常是 "1097,550"
-            if "," in content:
-                parts = content.split(",")
-                w, h = int(parts[0]), int(parts[1])
-                if w > 0 and h > 0:
-                    logger.info(f"屏幕尺寸来自帧缓冲区: {w}x{h}")
-                    return (w, h)
-    except Exception:
-        pass
-
-    return None
+DEFAULT_XVFB_RESOLUTION = "1080x1920x24"  # [v1.47.3] 默认竖屏(手机)，连接后由客户端视口自适应
 
 
 DEFAULT_X11VNC_PORT = 5900
@@ -146,16 +82,19 @@ class VNCManager:
         novnc_port: int = DEFAULT_NOVNC_PORT,
     ):
         self.display = display
-        # [v1.47.29] 自动检测 Android 屏幕尺寸设置 VNC 分辨率
+        # [v1.47.30] 初始分辨率 — 连接后由客户端视口自适应调整
+        # 也可通过 MYAGENT_SCREEN 环境变量手动指定初始分辨率（格式 "1097x550"）
         if not resolution:
-            screen_size = _detect_android_screen_size()
-            if screen_size:
-                w, h = screen_size
-                resolution = f"{w}x{h}x24"
-                logger.info(f"VNC 分辨率已适配设备屏幕: {w}x{h}")
+            env_screen = os.environ.get("MYAGENT_SCREEN", "").strip()
+            if env_screen and "x" in env_screen:
+                try:
+                    parts = env_screen.lower().split("x")
+                    resolution = f"{int(parts[0])}x{int(parts[1])}x24"
+                    logger.info(f"VNC 初始分辨率来自环境变量: {resolution}")
+                except (ValueError, IndexError):
+                    resolution = DEFAULT_XVFB_RESOLUTION
             else:
                 resolution = DEFAULT_XVFB_RESOLUTION
-                logger.info(f"未检测到设备屏幕尺寸，使用默认分辨率: {resolution}")
         self.resolution = resolution
         self.x11vnc_port = x11vnc_port
         self.novnc_port = novnc_port
@@ -715,6 +654,71 @@ class VNCManager:
             except Exception:
                 pass
 
+    def resize_display(self, width: int, height: int) -> Dict[str, Any]:
+        """[v1.47.30] 自适应调整 VNC 分辨率 — 匹配客户端视口大小。
+
+        当 noVNC 客户端视口尺寸变化时（手机旋转、窗口大小改变），
+        通过 xrandr 动态调整 Xvfb 帧缓冲区大小，实现像素级清晰显示。
+
+        Args:
+            width: 目标宽度（像素）
+            height: 目标高度（像素）
+
+        Returns:
+            {"success": bool, "resolution": str, "error": str}
+        """
+        if not self.is_running:
+            return {"success": False, "error": "VNC未运行"}
+
+        # 参数校验：合理范围
+        if width < 320 or height < 240 or width > 3840 or height > 3840:
+            return {"success": False, "error": f"分辨率超出合理范围: {width}x{height}"}
+
+        # 解析当前分辨率
+        try:
+            parts = self.resolution.split("x")
+            cur_w, cur_h = int(parts[0]), int(parts[1])
+            depth = parts[2] if len(parts) > 2 else "24"
+        except (ValueError, IndexError):
+            return {"success": False, "error": f"无法解析当前分辨率: {self.resolution}"}
+
+        # 如果分辨率没变，无需操作
+        if cur_w == width and cur_h == height:
+            return {"success": True, "resolution": self.resolution}
+
+        new_resolution = f"{width}x{height}x{depth}"
+        env = {**os.environ, "DISPLAY": self.display}
+
+        # 尝试 xrandr --fb 在线调整
+        xrandr_ok = False
+        if shutil.which("xrandr"):
+            try:
+                result = subprocess.run(
+                    ["xrandr", "--fb", f"{width}x{height}"],
+                    capture_output=True, text=True, timeout=5,
+                    env=env, start_new_session=True,
+                )
+                if result.returncode == 0:
+                    xrandr_ok = True
+                    logger.info(f"VNC 自适应分辨率: {cur_w}x{cur_h} → {width}x{height}")
+                else:
+                    logger.debug(f"xrandr --fb 失败: {(result.stderr or '')[:100]}")
+            except Exception as e:
+                logger.debug(f"xrandr --fb 异常: {e}")
+
+        if xrandr_ok:
+            self.resolution = new_resolution
+            # 更新旋转状态
+            if width > height:
+                self._current_rotation = "landscape"
+            else:
+                self._current_rotation = "portrait"
+            # 通知窗口管理器
+            self._notify_wm_resize(width, height, env)
+            return {"success": True, "resolution": new_resolution}
+
+        return {"success": False, "error": "xrandr 不支持，无法动态调整分辨率"}
+
     def ensure_dependencies(self) -> tuple:
         """检测并安装 VNC 所需依赖。
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.47.30",
+  "version": "1.47.31",
   "description": "\u672c\u5730\u684c\u9762\u7aef\u6267\u884c\u578bAI\u52a9\u624b - Open Interpreter \u98ce\u683c | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -628,6 +628,7 @@ class ApiServer:
         r.add_post("/api/vnc/restart", self.handle_vnc_restart)
         r.add_get("/api/vnc/screenshot", self.handle_vnc_screenshot)
         r.add_post("/api/vnc/rotate", self.handle_vnc_rotate)  # [v1.47.1] 屏幕旋转
+        r.add_post("/api/vnc/resize", self.handle_vnc_resize)  # [v1.47.30] 自适应分辨率
         r.add_get("/vnc/{path:.*}", self.handle_novnc_proxy)  # noVNC 客户端页面代理
         # [v1.20.8] VNC WebSocket 代理 — 通过主服务器转发 VNC WebSocket，解决 HTTPS/WSS 问题
         r.add_get("/api/vnc/ws", self.handle_vnc_websocket)
@@ -958,6 +959,20 @@ class ApiServer:
         result = mgr.rotate_display(direction)
         return web.json_response(result)
 
+    async def handle_vnc_resize(self, request):
+        """POST /api/vnc/resize - [v1.47.30] 自适应调整 VNC 分辨率匹配客户端视口"""
+        mgr = self._get_vnc_manager()
+        try:
+            data = await request.json()
+        except Exception:
+            data = {}
+        width = data.get("width", 0)
+        height = data.get("height", 0)
+        if not width or not height:
+            return web.json_response({"success": False, "error": "需要 width 和 height 参数"})
+        result = mgr.resize_display(int(width), int(height))
+        return web.json_response(result)
+
     async def handle_novnc_proxy(self, request):
         """GET /vnc/{path} - 代理 noVNC 客户端页面
         
@@ -1671,6 +1686,51 @@ function initVNC(RFBClass) {{
     window.rfb = rfb;
     window._vncConnect = connect;
     window._vncUseProxy = useProxy;
+
+    // [v1.47.30] 自适应分辨率 — 检测视口大小，通知后端调整 Xvfb 分辨率
+    // 实现：客户端知道自己的视口尺寸，通过 /api/vnc/resize 告诉后端
+    // 后端用 xrandr --fb 动态调整 Xvfb 帧缓冲区，实现像素级清晰
+    var _lastResizeW = 0, _lastResizeH = 0, _resizeDebounce = null;
+
+    function reportViewportSize() {{
+        // 计算实际可用区域（去掉工具栏和虚拟按键栏的高度）
+        var screenDiv = document.getElementById('screen');
+        if (!screenDiv) return;
+        var w = screenDiv.clientWidth;
+        var h = screenDiv.clientHeight;
+        if (w < 320 || h < 240) return;
+        // 避免微小变化频繁触发（差值 < 10px 忽略）
+        if (_lastResizeW > 0 && Math.abs(w - _lastResizeW) < 10 && Math.abs(h - _lastResizeH) < 10) return;
+        _lastResizeW = w;
+        _lastResizeH = h;
+        fetch('/api/vnc/resize', {{
+            method: 'POST',
+            headers: {{ 'Content-Type': 'application/json' }},
+            body: JSON.stringify({{ width: w, height: h }})
+        }}).then(function(r) {{ return r.json(); }})
+          .then(function(data) {{
+              if (data.success) {{
+                  var statusEl = document.getElementById('statusText');
+                  if (statusEl) statusEl.textContent = data.resolution || '';
+              }}
+          }}).catch(function() {{}});
+    }}
+
+    // 监听窗口大小变化（手机旋转 = resize 事件）
+    window.addEventListener('resize', function() {{
+        if (_resizeDebounce) clearTimeout(_resizeDebounce);
+        _resizeDebounce = setTimeout(reportViewportSize, 500);
+    }});
+
+    // VNC 连接成功后立即上报一次视口大小
+    // 监听 connect 事件（通过轮询 isConnected）
+    var _resizeCheckInterval = setInterval(function() {{
+        if (isConnected) {{
+            reportViewportSize();
+            clearInterval(_resizeCheckInterval);
+        }}
+    }}, 1000);
+
     window.sendCtrlAltDel = function() {{
         if (rfb) rfb.sendCtrlAltDel();
     }};