Update app.py

app.py

@@ -1315,21 +1315,22 @@ async def click_element(request: dict, token: str = Depends(verify_token)):
         except Exception:
             pass
 
-        # Obter tamanho real da viewport do Selenium
+        # Obter tamanho real da viewport
         viewport_width = driver.execute_script("return window.innerWidth;")
         viewport_height = driver.execute_script("return window.innerHeight;")
 
-        # Escalar coordenadas da imagem de preview para a viewport real
+        # Escalar coordenadas
         actual_x = int(x * viewport_width / img_width) if img_width > 0 else int(x)
         actual_y = int(y * viewport_height / img_height) if img_height > 0 else int(y)
-
-        # Garantir limites
         actual_x = max(0, min(actual_x, viewport_width - 1))
         actual_y = max(0, min(actual_y, viewport_height - 1))
 
         logger.info(f"Click: preview({x},{y}) img({img_width}x{img_height}) -> real({actual_x},{actual_y}) viewport({viewport_width}x{viewport_height})")
 
-        # Detectar elemento antes do clique
+        # Guardar URL antes do clique
+        original_url = driver.current_url
+
+        # Detectar elemento
         element_info = driver.execute_script(f"""
             var elem = document.elementFromPoint({actual_x}, {actual_y});
             if (elem) {{
@@ -1345,7 +1346,7 @@ async def click_element(request: dict, token: str = Depends(verify_token)):
             return null;
         """)
 
-        # Clicar via JavaScript (mais confiavel que ActionChains)
+        # Clicar via JavaScript
         driver.execute_script(f"""
             var elem = document.elementFromPoint({actual_x}, {actual_y});
             if (elem) {{
@@ -1353,33 +1354,53 @@ async def click_element(request: dict, token: str = Depends(verify_token)):
                 elem.click();
             }} else {{
                 var evt = new MouseEvent('click', {{
-                    bubbles: true,
-                    cancelable: true,
-                    clientX: {actual_x},
-                    clientY: {actual_y},
-                    view: window
+                    bubbles: true, cancelable: true,
+                    clientX: {actual_x}, clientY: {actual_y}, view: window
                 }});
-                document.elementFromPoint({actual_x}, {actual_y})?.dispatchEvent(evt);
+                document.body.dispatchEvent(evt);
             }}
         """)
 
+        # Esperar navegacao com timeout curto
         import time
-        time.sleep(2)
-
-        # Recuperar janela caso tenha mudado
-        try:
-            handles = driver.window_handles
-            if handles:
-                driver.switch_to.window(handles[-1])
-        except Exception:
-            pass
+        max_wait = 8
+        waited = 0
+        while waited < max_wait:
+            time.sleep(0.5)
+            waited += 0.5
+            try:
+                # Verificar se mudou de janela
+                handles = driver.window_handles
+                if handles:
+                    driver.switch_to.window(handles[-1])
+                # Verificar se pagina carregou
+                ready = driver.execute_script("return document.readyState;")
+                if ready == "complete":
+                    break
+            except Exception:
+                time.sleep(0.5)
+                waited += 0.5
+                try:
+                    handles = driver.window_handles
+                    if handles:
+                        driver.switch_to.window(handles[-1])
+                except Exception:
+                    pass
+                break
 
         # Screenshot
         screenshot = None
         try:
             screenshot = driver.get_screenshot_as_base64()
-        except Exception:
-            pass
+        except Exception as e:
+            logger.warning(f"Screenshot falhou apos clique: {e}")
+            try:
+                handles = driver.window_handles
+                if handles:
+                    driver.switch_to.window(handles[-1])
+                    screenshot = driver.get_screenshot_as_base64()
+            except Exception:
+                pass
 
         current_url = ""
         title = ""
@@ -1392,6 +1413,8 @@ async def click_element(request: dict, token: str = Depends(verify_token)):
         session["last_url"] = current_url
         session["last_activity"] = time.time()
 
+        url_changed = current_url != original_url
+
         return {
             "success": True,
             "message": f"Clique em ({actual_x}, {actual_y})",
@@ -1400,14 +1423,27 @@ async def click_element(request: dict, token: str = Depends(verify_token)):
             "url": current_url,
             "current_url": current_url,
             "title": title,
-            "screenshot": screenshot
+            "screenshot": screenshot,
+            "url_changed": url_changed
         }
 
     except HTTPException:
         raise
     except Exception as e:
         logger.error(f"Erro no clique: {e}")
-        return {"success": False, "message": str(e), "screenshot": None}
+        # Tentar screenshot mesmo com erro
+        screenshot = None
+        try:
+            driver = session_manager.get_session(request.get("session_id", ""))
+            if driver:
+                d = driver["driver"]
+                handles = d.window_handles
+                if handles:
+                    d.switch_to.window(handles[-1])
+                screenshot = d.get_screenshot_as_base64()
+        except Exception:
+            pass
+        return {"success": False, "message": str(e), "screenshot": screenshot}
 # ============================================================
 # SEARCH SITE
 # ============================================================