worker-automate-hub 0.5.66__py3-none-any.whl → 0.5.67__py3-none-any.whl

worker_automate_hub/tasks/jobs/conexao_rdp.py

@@ -1,5 +1,6 @@
 import asyncio
 import platform
+import re
 import subprocess
 import socket
 import pyautogui
@@ -7,7 +8,7 @@ import os
 import pygetwindow as gw
 from rich.console import Console
 import pygetwindow as gw
-from pywinauto import Application
+from pywinauto import Application, Desktop
 from worker_automate_hub.api.client import change_robot_status_true 
 from worker_automate_hub.models.dto.rpa_historico_request_dto import RpaHistoricoStatusEnum, RpaRetornoProcessoDTO, RpaTagDTO, RpaTagEnum
 from worker_automate_hub.models.dto.rpa_processo_rdp_dto import RpaProcessoRdpDTO
@@ -127,6 +128,23 @@ class RDPConnection:
         except Exception as error:
             console.print(f"Erro ao abrir a conexão RDP: {error}")
 
+    async def verificar_conexao_estabelecida(self):
+        janelas_rdp = [
+            win
+            for win in gw.getAllTitles()
+            if self.ip in win
+        ]
+
+        janela = None
+
+        for titulo in janelas_rdp:
+            janela = gw.getWindowsWithTitle(titulo)[0]
+            if not janela:
+                console.print(f"Erro ao localizar a janela: {titulo}")
+                continue
+            else:
+                return True
+
     async def conectar(self):
         console.print(f"Iniciando cliente RDP para {self.ip}")
         try:
@@ -163,8 +181,41 @@ class RDPConnection:
             except Exception as e:
                 console.print(f"Erro ao ativar a janela RDP: {e}", style="bold red")
 
+            app_window = None
+            possible_titles_patterns = [
+                re.compile(r"Conexão de Área de Trabalho Remota", re.IGNORECASE),
+                re.compile(r"Ligação ao ambiente de trabalho remoto", re.IGNORECASE),
+                re.compile(r"Segurança do Windows", re.IGNORECASE)
+            ]
+
+            janelas = Desktop(backend="uia").windows()
+            for janela in janelas:
+                titulo = janela.window_text()
+                for pattern in possible_titles_patterns:
+                    if pattern.search(titulo):
+                        try:
+                            app = Application(backend="uia").connect(title_re=pattern)
+                            app_window = app.window(title_re=pattern)
+                            console.print(f"Janela encontrada: {titulo}")
+                            break
+                        except Exception as e:
+                            console.print(f"Erro ao conectar a janela '{titulo}': {e}")
+                if app_window:
+                    break
+
+            await worker_sleep(2)
+
+            if app_window:
+                try:
+                    app_window.restore()
+                    app_window.set_focus()
+                    console.print("Foco definido com sucesso.")
+                except Exception as e:
+                    console.print(f"Erro ao definir foco na janela: {e}")
+            else:
+                console.print("Nenhuma janela correspondente foi encontrada.")
+
             await worker_sleep(5)
-           
             console.print("Inserindo senha.")
             pyautogui.write(self.password, interval=0.1)
             pyautogui.press("enter")
@@ -175,8 +226,6 @@ class RDPConnection:
             console.print("Credenciais inseridas.")
             await worker_sleep(5)
             
-            console.print("Conexão RDP ativa. Mantendo o script em execução.")
-            
             try:
                 base_path = os.path.join("worker_automate_hub", "tasks", "jobs")
                 rdp_file_path = os.path.join(base_path, "connection.rdp")
@@ -184,8 +233,13 @@ class RDPConnection:
                     os.remove(rdp_file_path)
             except Exception as error:
                 console.print(f"Erro ao deletar arquivo 'connection.rdp'. Error: {error}")
+
+            conexao_rdp_aberta = await self.verificar_conexao_estabelecida()
+            if conexao_rdp_aberta is not True:
+                raise ConnectionError("Não foi possível estabelecer conexão RDP.")
             
             return True
+
         except Exception as e:
             logger.error(f"Erro ao tentar conectar via RDP: {e}")
             return False
@@ -202,6 +256,7 @@ async def conexao_rdp(task: RpaProcessoRdpDTO) -> RpaRetornoProcessoDTO:
                 retorno="Não foi possível estabelecer conexão RDP. Verifique o IP e a disponibilidade da porta.",
                 status=RpaHistoricoStatusEnum.Falha, tags=[RpaTagDTO(descricao=RpaTagEnum.Tecnico)]
             )
+
         sucesso_conexao = await rdp.conectar()
         if sucesso_conexao:
             console.print("Processo de conexão RDP executado com sucesso.")
@@ -224,7 +279,7 @@ async def conexao_rdp(task: RpaProcessoRdpDTO) -> RpaRetornoProcessoDTO:
                 status=RpaHistoricoStatusEnum.Falha, tags=[RpaTagDTO(descricao=RpaTagEnum.Tecnico)]
             )
     except Exception as ex:
-        err_msg = f"Erro ao executar conexao_rdp: {ex}"
+        err_msg = f"Erro ao executar conexão RDP: {ex}"
         logger.error(err_msg)
         console.print(err_msg, style="bold red")
         return RpaRetornoProcessoDTO(

{worker_automate_hub-0.5.66.dist-info → worker_automate_hub-0.5.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: worker-automate-hub
-Version: 0.5.66
+Version: 0.5.67
 Summary: Worker Automate HUB é uma aplicação para automatizar rotinas de RPA nos ambientes Argenta.
 Author: Joel Paim
 Requires-Python: >=3.12,<4.0

{worker_automate_hub-0.5.66.dist-info → worker_automate_hub-0.5.67.dist-info}/RECORD

@@ -35,7 +35,7 @@ worker_automate_hub/models/dto/rpa_sistema_dto.py,sha256=sLkmJei8x6sl-1-IXUKDmYQ
 worker_automate_hub/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 worker_automate_hub/tasks/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 worker_automate_hub/tasks/jobs/coleta_dje_process.py,sha256=UkLWTC5Ub2qBb0yY-8IZ0DLLOVJOfNTq_z9krx_t25Q,29476
-worker_automate_hub/tasks/jobs/conexao_rdp.py,sha256=lNjD-JxpPTXdvFEJAkajC_Ltyw81rIEJeu7FUfRf2qI,9586
+worker_automate_hub/tasks/jobs/conexao_rdp.py,sha256=S6QC4xhuo0pB5FjaUJZNMm1LIgEjpjifReCTBDqxH-U,11719
 worker_automate_hub/tasks/jobs/descartes.py,sha256=0bMCJ0xIcK8TLSgjF6taAbGFLMU-sGDVFIhUYSRtrbg,41092
 worker_automate_hub/tasks/jobs/devolucao_prazo_a_faturar.py,sha256=Ao8z3KrJn8sdglp65tdW0sMp-g5EPlo5JOv7fMSF4yc,79854
 worker_automate_hub/tasks/jobs/ecac_estadual_go.py,sha256=dKkf22nH5gp3RErq5u0UzRsKyJ81fc6ZZ4vLtUuMwHA,21002
@@ -76,7 +76,7 @@ worker_automate_hub/utils/updater.py,sha256=en2FCGhI8aZ-JNP3LQm64NJDc4awCNW7UhbV
 worker_automate_hub/utils/util.py,sha256=_uPyZOzb8puEKXUmcFkaf7HesJBs8yITRQkOqViyugU,161430
 worker_automate_hub/utils/utils_nfe_entrada.py,sha256=iYpOs7fb7C3bY61QHySr00xlDNzrrCP0zaexOpBPuaQ,31930
 worker_automate_hub/worker.py,sha256=CT-poyP1ZYvubArYsnnNd9oJ53SPaDwgr6p6keS3nI4,6248
-worker_automate_hub-0.5.66.dist-info/entry_points.txt,sha256=sddyhjx57I08RY8X7UxcTpdoOsWULAWNKN9Xr6pp_Kw,54
-worker_automate_hub-0.5.66.dist-info/METADATA,sha256=7Haa1PMIHptI8Y1IgJ2OdWNMZWLKYXFTzdN4sDFfk4I,2894
-worker_automate_hub-0.5.66.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-worker_automate_hub-0.5.66.dist-info/RECORD,,
+worker_automate_hub-0.5.67.dist-info/entry_points.txt,sha256=sddyhjx57I08RY8X7UxcTpdoOsWULAWNKN9Xr6pp_Kw,54
+worker_automate_hub-0.5.67.dist-info/METADATA,sha256=sMG87H1stQsWzYw7LdW4Mrnf2Rtg28wOOrx2pp-x2eU,2894
+worker_automate_hub-0.5.67.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+worker_automate_hub-0.5.67.dist-info/RECORD,,