Update app.py

app.py

@@ -556,14 +556,17 @@ def run_command_smart(cmd: str, timeout: int = 60) -> dict:
     }
 
 
-def xdo(args: list, timeout=10) -> dict:
-    r = subprocess.run(["xdotool"] + args,
-                       env={**os.environ, "DISPLAY": DISPLAY},
-                       timeout=timeout, capture_output=True, text=True)
-    return {"rc": r.returncode, "out": r.stdout, "err": r.stderr}
+async def xdo(args: list, timeout=10) -> dict:
+    """ينفّذ xdotool في thread منفصل حتى لا يُجمّد حلقة asyncio أثناء الانتظار."""
+    def _run():
+        r = subprocess.run(["xdotool"] + args,
+                           env={**os.environ, "DISPLAY": DISPLAY},
+                           timeout=timeout, capture_output=True, text=True)
+        return {"rc": r.returncode, "out": r.stdout, "err": r.stderr}
+    return await asyncio.to_thread(_run)
 
 
-def type_text_smart(text: str) -> dict:
+async def type_text_smart(text: str) -> dict:
     """
     كتابة نص ذكية — تدعم العربية والإنجليزية:
     - للنصوص الإنجليزية: xdotool type مباشرة
@@ -574,23 +577,25 @@ def type_text_smart(text: str) -> dict:
     if has_arabic:
         # طريقة Clipboard لضمان كتابة العربية بشكل صحيح
         try:
-            proc = subprocess.Popen(
-                ["xclip", "-selection", "clipboard"],
-                stdin=subprocess.PIPE,
-                env={**os.environ, "DISPLAY": DISPLAY}
-            )
-            proc.communicate(text.encode("utf-8"))
-            time.sleep(0.15)
+            def _xclip_write():
+                proc = subprocess.Popen(
+                    ["xclip", "-selection", "clipboard"],
+                    stdin=subprocess.PIPE,
+                    env={**os.environ, "DISPLAY": DISPLAY}
+                )
+                proc.communicate(text.encode("utf-8"))
+            await asyncio.to_thread(_xclip_write)
+            await asyncio.sleep(0.15)
             # Focus + paste
-            xdo(["key", "--clearmodifiers", "ctrl+v"])
+            await xdo(["key", "--clearmodifiers", "ctrl+v"])
             return {"success": True, "method": "clipboard+paste", "arabic": True}
         except Exception as e:
             # fallback: xdotool type
-            r = xdo(["type", "--clearmodifiers", "--delay", "50", text])
+            r = await xdo(["type", "--clearmodifiers", "--delay", "50", text])
             return {"success": r["rc"] == 0, "method": "xdotool_fallback", "error": r["err"]}
     else:
         # إنجليزية: xdotool type مباشرة
-        r = xdo(["type", "--clearmodifiers", "--delay", "30", text])
+        r = await xdo(["type", "--clearmodifiers", "--delay", "30", text])
         return {"success": r["rc"] == 0, "method": "xdotool_direct"}
 
 
@@ -841,7 +846,7 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "mouse_move":
         x, y = int(data.get("x", 0)), int(data.get("y", 0))
         # --sync ينتظر حتى يؤكد X server استلام الأمر
-        xdo(["mousemove", "--sync", str(x), str(y)])
+        await xdo(["mousemove", "--sync", str(x), str(y)])
         await send({"type": "ack", "action": "mouse_move", "x": x, "y": y})
         # مرّر الإحداثيات مباشرةً لتجنّب race condition مع X server
         await auto_shot_grid(f"ماوس → ({x},{y})", delay=0.2,
@@ -851,12 +856,12 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "mouse_click":
         x, y = int(data.get("x", 0)), int(data.get("y", 0))
         btn_num = {"left": "1", "middle": "2", "right": "3"}.get(data.get("button", "left"), "1")
-        xdo(["mousemove", "--sync", str(x), str(y)])
+        await xdo(["mousemove", "--sync", str(x), str(y)])
         await asyncio.sleep(0.08)
         if data.get("double"):
-            xdo(["click", "--repeat", "2", "--delay", "100", btn_num])
+            await xdo(["click", "--repeat", "2", "--delay", "100", btn_num])
         else:
-            xdo(["click", btn_num])
+            await xdo(["click", btn_num])
         btn_name = {"1": "left", "2": "middle", "3": "right"}.get(btn_num, "left")
         await send({"type": "ack", "action": "mouse_click", "x": x, "y": y, "button": btn_name})
         # مرّر الإحداثيات مباشرةً لتجنّب race condition
@@ -867,7 +872,7 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "keyboard_type":
         text = data.get("text", "")
         if text:
-            result = type_text_smart(text)
+            result = await type_text_smart(text)
             await send({"type": "ack", "action": "keyboard_type",
                         "method": result["method"], "text_len": len(text)})
         else:
@@ -878,7 +883,7 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "keyboard_hotkey":
         keys = data.get("keys", [])
         if keys:
-            xdo(["key", "--clearmodifiers", "+".join(keys)])
+            await xdo(["key", "--clearmodifiers", "+".join(keys)])
         await send({"type": "ack", "action": "keyboard_hotkey", "keys": keys})
         await auto_shot_grid("بعد الاختصار", delay=0.5)
 
@@ -886,7 +891,7 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "keyboard_press":
         key = data.get("key", "")
         if key:
-            xdo(["key", "--clearmodifiers", key])
+            await xdo(["key", "--clearmodifiers", key])
         await send({"type": "ack", "action": "keyboard_press"})
         await auto_shot_grid("بعد المفتاح", delay=0.4)
 
@@ -894,19 +899,21 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "clipboard_write":
         text = data.get("text", "")
         try:
-            proc = subprocess.Popen(
-                ["xclip", "-selection", "clipboard"],
-                stdin=subprocess.PIPE,
-                env={**os.environ, "DISPLAY": DISPLAY}
-            )
-            proc.communicate(text.encode("utf-8"))
+            def _xclip_write2():
+                proc = subprocess.Popen(
+                    ["xclip", "-selection", "clipboard"],
+                    stdin=subprocess.PIPE,
+                    env={**os.environ, "DISPLAY": DISPLAY}
+                )
+                proc.communicate(text.encode("utf-8"))
+            await asyncio.to_thread(_xclip_write2)
             await send({"type": "ack", "action": "clipboard_write", "length": len(text)})
         except Exception as e:
             await send({"type": "error", "action": "clipboard_write", "msg": str(e)})
 
     # ── clipboard_read ────────────────────────────────
     elif action == "clipboard_read":
-        res = run_raw_command("xclip -selection clipboard -o", timeout=5)
+        res = await asyncio.to_thread(run_raw_command, "xclip -selection clipboard -o", 5)
         await send({"type": "clipboard_content", "text": res["stdout"]})
 
     # ── scroll ────────────────────────────────────────
@@ -914,9 +921,9 @@ async def handle_action(ws: WebSocket, msg: dict):
         x, y = int(data.get("x", 0)), int(data.get("y", 0))
         clicks = int(data.get("clicks", 3))
         btn = "4" if clicks > 0 else "5"
-        xdo(["mousemove", str(x), str(y)])
+        await xdo(["mousemove", str(x), str(y)])
         for _ in range(abs(clicks)):
-            xdo(["click", btn])
+            await xdo(["click", btn])
             await asyncio.sleep(0.03)
         await send({"type": "ack", "action": "scroll", "clicks": clicks})
         await auto_shot_grid("بعد التمرير", delay=0.4)
@@ -928,7 +935,7 @@ async def handle_action(ws: WebSocket, msg: dict):
             fixed_cmd = app_cmd
             # إصلاح firefox-esr
             if "firefox-esr" in app_cmd:
-                esr_check = subprocess.run(["which", "firefox-esr"], capture_output=True, text=True)
+                esr_check = await asyncio.to_thread(subprocess.run, ["which", "firefox-esr"], capture_output=True, text=True)
                 if esr_check.returncode != 0:
                     fixed_cmd = app_cmd.replace("firefox-esr", BROWSER)
 
@@ -961,12 +968,12 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "mouse_drag":
         x1, y1 = int(data.get("x1", 0)), int(data.get("y1", 0))
         x2, y2 = int(data.get("x2", 0)), int(data.get("y2", 0))
-        xdo(["mousemove", str(x1), str(y1)])
-        xdo(["mousedown", "1"])
+        await xdo(["mousemove", str(x1), str(y1)])
+        await xdo(["mousedown", "1"])
         await asyncio.sleep(0.1)
-        xdo(["mousemove", str(x2), str(y2)])
+        await xdo(["mousemove", str(x2), str(y2)])
         await asyncio.sleep(0.1)
-        xdo(["mouseup", "1"])
+        await xdo(["mouseup", "1"])
         await send({"type": "ack", "action": "mouse_drag"})
         # cursor ينتهي عند x2,y2
         await auto_shot_grid("بعد السحب", delay=0.4, force_mx=x2, force_my=y2)
@@ -989,8 +996,8 @@ async def handle_action(ws: WebSocket, msg: dict):
 
     # ── screen_info ───────────────────────────────────
     elif action == "screen_info":
-        w, h = _get_screen_size()
-        mx, my = _get_mouse_pos()
+        w, h = await asyncio.to_thread(_get_screen_size)
+        mx, my = await asyncio.to_thread(_get_mouse_pos)
         await send({
             "type": "screen_info",
             "width": w, "height": h,
@@ -1002,14 +1009,16 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "paste":
         text = data.get("text", "")
         if text:
-            proc = subprocess.Popen(
-                ["xclip", "-selection", "clipboard"],
-                stdin=subprocess.PIPE,
-                env={**os.environ, "DISPLAY": DISPLAY}
-            )
-            proc.communicate(text.encode("utf-8"))
+            def _xclip_paste():
+                proc = subprocess.Popen(
+                    ["xclip", "-selection", "clipboard"],
+                    stdin=subprocess.PIPE,
+                    env={**os.environ, "DISPLAY": DISPLAY}
+                )
+                proc.communicate(text.encode("utf-8"))
+            await asyncio.to_thread(_xclip_paste)
             await asyncio.sleep(0.1)
-            xdo(["key", "--clearmodifiers", "ctrl+v"])
+            await xdo(["key", "--clearmodifiers", "ctrl+v"])
         await send({"type": "ack", "action": "paste"})
         await auto_shot_grid("بعد اللصق", delay=0.5)