pyx3270 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

pyx3270/__init__.py

@@ -16,5 +16,5 @@ from pyx3270.emulator import X3270
 from pyx3270.offline import PyX3270Manager
 
 __author__ = 'MatheusLPolidoro'
-__version__ = '0.1.5'
+__version__ = '0.1.7'
 __all__ = ['X3270', 'replay', 'record', 'PyX3270Manager']

pyx3270/cli.py

@@ -1,5 +1,6 @@
 import os
 import socket
+import sys
 import threading
 from time import sleep
 from typing import Callable
@@ -110,7 +111,9 @@ def replay(
     except KeyboardInterrupt:
         rich.print('\n[x] Interrompido pelo usuário.')
         state.command_process.terminate()
-        os._exit(0)
+        if emulator:
+            emu.terminate()
+        sys.exit(0)
 
 
 @app.command()
@@ -125,12 +128,12 @@ def record(
     port = int(*port) if port else 3270
 
     rich.print(f'[+] RECORD na porta {port}')
-
+    reconnect = False
     try:
         while True:
-            if emulator:
+            if emulator and not reconnect:
                 emu = X3270(visible=True, model=model, save_log_file=True)
-            else:
+            elif not reconnect:
                 emu = None
 
             server_thread = start_server_thread(
@@ -142,13 +145,19 @@ def record(
 
             if emulator:
                 rich.print('[+] Conectando ao emulador...')
-                emu.connect_host('localhost', port, tls, mode_3270=False)
+                if reconnect:
+                    emu.reconnect_host()
+                else:
+                    emu.connect_host('localhost', port, tls, mode_3270=False)
 
             rich.print(f'[+] Escutando localhost, origem {host=} {port=}')
             control_replay(server_thread)
+            reconnect = True
     except KeyboardInterrupt:
         rich.print('\n[x] Interrompido pelo usuário.')
-        os._exit(0)
+        if emulator:
+            emu.terminate()
+        sys.exit(0)
 
 
 if __name__ == '__main__':

pyx3270/emulator.py

@@ -370,7 +370,7 @@ class Wc3270App(ExecutableApp):
 
 class Ws3270App(ExecutableApp):
     args = [
-        get_binary_path("windows", "ws3270"),
+        get_binary_path('windows', 'ws3270'),
         '-xrm',
         'ws3270.unlockDelay:False',
     ]
@@ -740,6 +740,7 @@ class X3270(AbstractEmulator, X3270Cmd):
         self.port = None
         self.tls = None
         self.mode_3270 = None
+        self.last_command_time = None
         logger.debug('X3270 inicializado')
 
     def _create_app(self) -> None:
@@ -774,6 +775,7 @@ class X3270(AbstractEmulator, X3270Cmd):
                 cmd = Command(self.app, cmdstr)
                 cmd.execute()
                 self.status = Status(cmd.status_line)
+                self.last_command_time = time()
                 logger.debug(f'Comando executado, status: {self.status}')
                 return cmd
             except NotConnectedException:
@@ -816,6 +818,17 @@ class X3270(AbstractEmulator, X3270Cmd):
     def is_connected(self) -> bool:
         logger.debug('Verificando estado de conexão')
         try:
+            # Verifica tempo desde o último comando
+            elapsed_max = 600
+            if self.last_command_time:
+                elapsed = time() - self.last_command_time
+                if elapsed > elapsed_max:
+                    logger.warning(
+                        f'Tempo de inatividade excedido: '
+                        f'{elapsed:.2f} segundos'
+                    )
+                    return False
+
             self.query('ConnectionState')
             is_connected = self.status.connection_state.startswith(b'C(')
             logger.info(f'Estado de conexão: {is_connected}')

pyx3270/hook/hook-pyx3270.py

@@ -1,4 +1,5 @@
 import os
+
 from PyInstaller.utils.hooks import get_package_paths
 
 # Caminho do pacote instalado
@@ -16,7 +17,9 @@ if os.path.isdir(bin_dir):
             # Caminho relativo a partir da pasta bin (ex: windows/wc3270.exe)
             rel_path = os.path.relpath(full_path, bin_dir)
             # Corrige o destino para ser uma pasta, não um arquivo
-            target_dir = os.path.join('pyx3270', 'bin', os.path.dirname(rel_path))
+            target_dir = os.path.join(
+                'pyx3270', 'bin', os.path.dirname(rel_path)
+            )
             datas.append((full_path, target_dir))
 
 __all__ = ['datas']

pyx3270/offline.py

@@ -1,5 +1,4 @@
 import subprocess
-import sys
 from logging import getLogger
 from time import sleep
 
@@ -11,8 +10,6 @@ logger = getLogger(__name__)
 class PyX3270Manager:
     def __init__(self, emu: AbstractEmulator, directory='./screens'):
         self.command = [
-            sys.executable,
-            '-m',
             'pyx3270',
             'replay',
             '--directory',
@@ -48,6 +45,7 @@ class PyX3270Manager:
             return
         self.emu.pf(1)
         sleep(0.1)
+        self.emu.pf(1)
 
     def next(self):
         """Define a tela específica e aguarda processamento corretamente."""
@@ -75,6 +73,7 @@ class PyX3270Manager:
     def change_directory(self, directory: str):
         """Troca o diretório de carregamento das telas."""
         self._exec(f'change directory {directory}')
+        sleep(1)
         self.emu.pf(1)
 
     def terminate(self):

pyx3270/server.py

@@ -107,7 +107,7 @@ def find_directory(base_dir: str, search_name: str) -> str | None:
             ):  # Compara de forma insensível a maiúsculas/minúsculas
                 return os.path.join(base_dir, dir_name)
 
-    return None  # Retorna None se não encontrar um diretório correspondente
+    return None
 
 
 def convert_s(hex_string: str) -> str:

{pyx3270-0.1.5.dist-info → pyx3270-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyx3270
-Version: 0.1.5
+Version: 0.1.7
 Summary: Uma interface comum utilizada para automações de terminais 3270 da IBM.
 Author-email: MatheusLPolidoro <mattpolidoro4@gmail.com>
 Project-URL: Documentation, https://matheuslpolidoro.github.io/pyx3270/

{pyx3270-0.1.5.dist-info → pyx3270-0.1.7.dist-info}/RECORD

@@ -1,35 +1,34 @@
 docs/gen_tree.py,sha256=DQbnAfFVeeMT2mZMzByKVdM1Qm_O0q3mRrzKqKfSQ5M,11374
-pyx3270/__init__.py,sha256=pJu4quNUGZOa7kI6y9YCAhg17ftOlamSnPtYvYR-IXI,1226
+pyx3270/__init__.py,sha256=_mE6bVXgKTHAQItHYXhqDlDs9pWuCx-7xf_gpCGiD2A,1226
 pyx3270/__main__.py,sha256=YyGX6Wbn7bgOvXjHIeGf8Z2so8MEtXXMRcaJnqR8tU4,70
-pyx3270/cli.py,sha256=_Vrmg-p1i889q9zS-k7IBS6_OHDMWtTt2b6-Mx5Esdk,4571
-pyx3270/emulator.py,sha256=8qj25lOQx2geIJiKi3ajo0qJToTE2qC3ZmZLTMMqlIQ,31820
+pyx3270/cli.py,sha256=UozbD7kvCTKiNTK9mdiLlsOVBSwrjjXg8B99rDBYUz0,4868
+pyx3270/emulator.py,sha256=WCK9mWcCA6PhXrPbeJePSp-xcPFYirGdXJ86tjUBUJg,32342
 pyx3270/exceptions.py,sha256=TtM9LugE5m4E01vI9PnzCE-BRMqigiWvoeGTLTDDbfo,607
 pyx3270/iemulator.py,sha256=tVEFNlZMSww2LsfdXZgmg2XJtT716uGvOHyU7G_UXBU,3081
 pyx3270/logging_config.py,sha256=k5sYSlaAe-_hkMR2V37eXRiQ4aPNRm6R7az1iEZ4IH4,1667
-pyx3270/offline.py,sha256=_ye3KC3FIkOEwSS0EykG4hdWSuu7zgJhl4dvI5-gCVw,2881
+pyx3270/offline.py,sha256=jmZsabi_cLZvO4WXvrxFZ50p_CRQ9dkZ8pmo7oK3fM0,2863
 pyx3270/py.typed,sha256=eSgqDZOdQoML2kw4FABXkFkJeM2184WI1ojN8ed6k4Q,50
-pyx3270/server.py,sha256=57KufyvPAIEbKmIKdVvvoZ9eJgDqo1OPg02MMvY41IE,14170
+pyx3270/server.py,sha256=5M4xovZGNdkYj7EB_BvHCNE43aLGA95puZhmoJk99tY,14107
 pyx3270/state.py,sha256=8MHyzT89IHWrXmVgbiSxvsfKSLQhsaZsXj4OOediPxA,72
 pyx3270/tn3270.py,sha256=-trKVI3uimpte6_IzYjwGv4UpGIEacKjI1knQFunNi0,6640
 pyx3270/x3270_commands.py,sha256=A65TZmjYakx9U8iiw60InxgVHkFc6XN2mYiFYiJQV8Y,9088
-pyx3270/bin/start.bin,sha256=HcQargbf60Mi902TLm1cYk9XfhoOq5ktCk7fhka3oZg,831
-pyx3270/bin/start.bin.bak,sha256=v1thzPr4nUjqNMlSPT9P9aY4RJuRa4mvE0b9es-cfvQ,831
+pyx3270/bin/start.bin,sha256=k9epfaJ84n2HyYnhYLF3qieYRjIvdQ-eL5kS6a_LH9E,831
 pyx3270/bin/linux/s3270,sha256=2hIg5zTQ47okqtMUyiObLQWCdGLQw0uOw3NyuvWhfKk,2880816
 pyx3270/bin/linux/x3270,sha256=udKhVgQZDEu6_QQ37GeoH4zZwFQaw0x7OYw80Kh6-58,1719552
 pyx3270/bin/windows/wc3270.exe,sha256=gYE5ge5cgLlwkd1R5GG2WWAlQt_veXCydb8rARtP3lI,3570888
 pyx3270/bin/windows/ws3270.exe,sha256=eearMtLt-VtQrODep-PMxLZglVR5gb7-Le6OX3-tw_E,2904696
 pyx3270/hook/__init__.py,sha256=y0FL6nUHAtFJY2o_PWl1LxbvHPcwaA_Uj-tZJTlNeuc,77
-pyx3270/hook/hook-pyx3270.py,sha256=w006LtuugFG7RryBEWnjsKqLyiqU5q-jFhJMKTBW8XI,779
+pyx3270/hook/hook-pyx3270.py,sha256=YZr9Q_RQDPOvpt_QSTPxXiHZcmqNcgt7IPYGUsL2WwE,813
 site/gen_tree.py,sha256=DQbnAfFVeeMT2mZMzByKVdM1Qm_O0q3mRrzKqKfSQ5M,11374
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=eFhdOo-a-hlbx61S2c6JUcFOHVzlf3OpCTJW-4VM0Ls,8134
 tests/test_cli.py,sha256=JW0PBFxvux0J5ZFlzhSPiIie5NqQ2Q3dti_rZt_0HtA,3200
 tests/test_emulator.py,sha256=fpmKiGN1pyEN470XstCG8EsEpnaqFrBQ76tSp5_Sdas,69346
 tests/test_exceptions.py,sha256=pvpwEUFEEju2CgBR3QPpm6wspiwzP1jp5K7gX9Pagrw,1226
-tests/test_offline.py,sha256=bkwHMoevAl3UEj8UmclM4adSm0kujjNNX83Dlx1nBpM,5572
+tests/test_offline.py,sha256=jIE2rd99I4t7oRobOsmf2uaiYswQ4m74e6Q9Mj4rGYk,5583
 tests/test_server.py,sha256=FlJ_gEhRtoESc1m9EKCfJRXeGJnMRyoUtKF1VkOYhBY,23608
-pyx3270-0.1.5.dist-info/METADATA,sha256=2otXGZmTsbnDnk5RpIGIVqyOIxGOUCGmP9SudvjCZwI,3417
-pyx3270-0.1.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-pyx3270-0.1.5.dist-info/entry_points.txt,sha256=9kg9FaegDY2FXCVplltQGAmMiWia1LnnsPF7c1uQpa0,105
-pyx3270-0.1.5.dist-info/top_level.txt,sha256=ptTDzZHpMHYKlnFM01XeuAnLhdlYO2NZQeER6hp3euA,24
-pyx3270-0.1.5.dist-info/RECORD,,
+pyx3270-0.1.7.dist-info/METADATA,sha256=Ns2mIUjK9S8Q1BZm11XtsZsvsxazoGEJpW0n73l3vPw,3417
+pyx3270-0.1.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+pyx3270-0.1.7.dist-info/entry_points.txt,sha256=9kg9FaegDY2FXCVplltQGAmMiWia1LnnsPF7c1uQpa0,105
+pyx3270-0.1.7.dist-info/top_level.txt,sha256=ptTDzZHpMHYKlnFM01XeuAnLhdlYO2NZQeER6hp3euA,24
+pyx3270-0.1.7.dist-info/RECORD,,

tests/test_offline.py

@@ -2,7 +2,7 @@ import gc
 import subprocess
 import sys
 import weakref
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch, call
 
 from pyx3270.offline import PyX3270Manager
 
@@ -17,8 +17,6 @@ def test_pyx3270_manager_init_and_terminate(mock_popen, x3270_cmd_instance):
 
     mock_popen.assert_called_once_with(
         [
-            sys.executable,
-            '-m',
             'pyx3270',
             'replay',
             '--directory',
@@ -58,7 +56,8 @@ def test_pyx3270_manager_exec(mock_logger, mock_popen, x3270_cmd_instance):
     )
     mock_process.stdin.write.assert_called_once_with(f'{command}\n')
     mock_process.stdin.flush.assert_called_once()
-    manager.emu.pf.assert_called_once_with(1)
+    assert manager.emu.pf.call_count == 2
+    manager.emu.pf.assert_has_calls([call(1), call(1)])
 
 
 @patch('subprocess.Popen')