Update app.py

app.py

@@ -656,8 +656,47 @@ def _sanitize_pkill_self_match(cmd: str) -> str:
     return _PKILL_SELF_MATCH_RE.sub(_fix, cmd)
 
 
+_BING_URL_RE = re.compile(r"https?://(?:www\.)?bing\.com[^\s'\"]*")
+_DDG_URL_RE = re.compile(r"https?://(?:www\.)?duckduckgo\.com[^\s'\"]*")
+_GOOGLE_URL_RE = re.compile(r"https?://(?:www\.)?google\.[a-z.]+[^\s'\"]*")
+
+def _enforce_safesearch(text: str) -> str:
+    """
+    يفرض معاملات SafeSearch الصارمة تلقائياً على أي رابط Bing أو DuckDuckGo أو Google
+    موجود في النص، بغض النظر عمّا كتبه الذكاء — حماية إلزامية على مستوى السيرفر
+    لمنع ظهور محتوى غير لائق في نتائج البحث، مستقلة عن تعليمات الـ prompt.
+    تغطي أيضاً حالة الوصول لـ Google بشكل غير مباشر (عبر رابط مكتوب صريح في الأمر).
+    """
+    def _fix_bing(m):
+        url = m.group(0)
+        if "adlt=" in url:
+            return re.sub(r"adlt=\w+", "adlt=strict", url)
+        sep = "&" if "?" in url else "?"
+        return url + f"{sep}adlt=strict"
+
+    def _fix_ddg(m):
+        url = m.group(0)
+        if "kp=" in url:
+            return re.sub(r"kp=\d", "kp=1", url)
+        sep = "&" if "?" in url else "?"
+        return url + f"{sep}kp=1"
+
+    def _fix_google(m):
+        url = m.group(0)
+        if "safe=" in url:
+            return re.sub(r"safe=\w+", "safe=strict", url)
+        sep = "&" if "?" in url else "?"
+        return url + f"{sep}safe=strict"
+
+    text = _BING_URL_RE.sub(_fix_bing, text)
+    text = _DDG_URL_RE.sub(_fix_ddg, text)
+    text = _GOOGLE_URL_RE.sub(_fix_google, text)
+    return text
+
+
 def run_raw_command(cmd: str, timeout: int = 60) -> dict:
     cmd = _sanitize_pkill_self_match(cmd)
+    cmd = _enforce_safesearch(cmd)
     env = {**os.environ, "DISPLAY": DISPLAY_OF(),
            "PYTHONIOENCODING": "utf-8", "LANG": "en_US.UTF-8"}
     try:
@@ -1039,7 +1078,7 @@ async def handle_action(ws: WebSocket, msg: dict):
 
     # ── keyboard_type ─────────────────────────────────
     elif action == "keyboard_type":
-        text = data.get("text", "")
+        text = _enforce_safesearch(data.get("text", ""))
         if text:
             result = await type_text_smart(text)
             await send({"type": "ack", "action": "keyboard_type",
@@ -1102,12 +1141,12 @@ async def handle_action(ws: WebSocket, msg: dict):
     elif action == "open_app":
         app_cmd = data.get("cmd", "")
         if app_cmd:
-            fixed_cmd = app_cmd
+            fixed_cmd = _enforce_safesearch(app_cmd)
             # إصلاح firefox-esr
-            if "firefox-esr" in app_cmd:
+            if "firefox-esr" in fixed_cmd:
                 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)
+                    fixed_cmd = fixed_cmd.replace("firefox-esr", BROWSER)
 
             # ── حماية إضافية: حذف ملفات قفل Firefox المتبقية قبل فتح نافذة جديدة ──
             # يمنع ظهور "Firefox is already running, but is not responding" حتى لو
@@ -1165,6 +1204,48 @@ async def handle_action(ws: WebSocket, msg: dict):
     # ── start_stream / stop_stream: غير مستخدمة من الواجهة الحالية، أُزيلت لمنع
     # تشغيل حلقة تصوير مستمرة في الخلفية بلا داعٍ (كانت تستهلك موارد حتى بعد إغلاق الاتصال) ──
 
+    # ── open_tab ──────────────────────────────────────
+    elif action == "open_tab":
+        url = _enforce_safesearch(data.get("url", "") or "about:blank")
+        await xdo(["key", "--clearmodifiers", "ctrl+t"])
+        await asyncio.sleep(0.4)
+        await xdo(["key", "--clearmodifiers", "ctrl+l"])
+        await asyncio.sleep(0.2)
+        await type_text_smart(url)
+        await asyncio.sleep(0.2)
+        await xdo(["key", "--clearmodifiers", "Return"])
+        await send({"type": "ack", "action": "open_tab", "url": url})
+        await auto_shot_grid("بعد فتح تبويب جديد", delay=1.5)
+
+    # ── close_tab ─────────────────────────────────────
+    elif action == "close_tab":
+        await xdo(["key", "--clearmodifiers", "ctrl+w"])
+        await send({"type": "ack", "action": "close_tab"})
+        await auto_shot_grid("بعد إغلاق التبويب", delay=0.5)
+
+    # ── browser_back ──────────────────────────────────
+    elif action == "browser_back":
+        await xdo(["key", "--clearmodifiers", "alt+Left"])
+        await send({"type": "ack", "action": "browser_back"})
+        await auto_shot_grid("بعد الرجوع", delay=0.8)
+
+    # ── browser_forward ───────────────────────────────
+    elif action == "browser_forward":
+        await xdo(["key", "--clearmodifiers", "alt+Right"])
+        await send({"type": "ack", "action": "browser_forward"})
+        await auto_shot_grid("بعد التقدم", delay=0.8)
+
+    # ── browser_search: اختصار لفتح بحث مباشرة في التبويب الحالي ──
+    elif action == "browser_search":
+        url = _enforce_safesearch(data.get("url", "") or data.get("query", ""))
+        await xdo(["key", "--clearmodifiers", "ctrl+l"])
+        await asyncio.sleep(0.2)
+        await type_text_smart(url)
+        await asyncio.sleep(0.2)
+        await xdo(["key", "--clearmodifiers", "Return"])
+        await send({"type": "ack", "action": "browser_search", "url": url})
+        await auto_shot_grid("بعد البحث", delay=1.5)
+
     # ── screen_info ───────────────────────────────────
     elif action == "screen_info":
         w, h = await asyncio.to_thread(_get_screen_size)
@@ -1198,7 +1279,7 @@ async def handle_action(ws: WebSocket, msg: dict):
     else:
         await send({
             "type": "error",
-            "msg": f"Unknown action: '{action}'. Available: screenshot, terminal, mouse_move, mouse_click, mouse_drag, keyboard_type, keyboard_hotkey, keyboard_press, clipboard_write, clipboard_read, scroll, open_app, open_browser, paste, simple_command, screen_info"
+            "msg": f"Unknown action: '{action}'. Available: screenshot, terminal, mouse_move, mouse_click, mouse_drag, keyboard_type, keyboard_hotkey, keyboard_press, clipboard_write, clipboard_read, scroll, open_app, open_tab, close_tab, browser_back, browser_forward, browser_search, open_browser, paste, simple_command, screen_info"
         })