pywebexec 1.6.11__py3-none-any.whl → 1.6.13__py3-none-any.whl

pywebexec/pywebexec.py

@@ -25,7 +25,7 @@ import termios
 import struct
 import subprocess
 import logging
-
+import pyte
 
 if os.environ.get('PYWEBEXEC_LDAP_SERVER'):
     from ldap3 import Server, Connection, ALL, SIMPLE, SUBTREE, Tls
@@ -181,8 +181,14 @@ class PyWebExec(Application):
     def load(self):
         return self.application
 
-
-ANSI_ESCAPE = re.compile(br'(?:\x1B[@-Z\\-_]|\x1B([(]B|>)|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~]|\x1B\[[0-9]{1,2};[0-9]{1,2}[m|K]|\x1B\[[0-9;]*[mGKHF]|[\x00-\x1F\x7F])')
+def get_visible_output(line):
+    screen = pyte.Screen(len(line)+1, 2)
+    stream = pyte.Stream(screen)
+    stream.feed(line)
+    visible_line = screen.display[0]
+    return visible_line
+                                                                                                    #38;2;66;59;165m
+ANSI_ESCAPE = re.compile(br'(?:\x1B[@-Z\\-_]|\x1B([(]B|>)|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~]|\x1B\[([0-9]{1,2};){0,4}[0-9]{1,3}[m|K]|\x1B\[[0-9;]*[mGKHF]|[\x00-\x1F\x7F])')
 
 def strip_ansi_control_chars(text):
     """Remove ANSI and control characters from the text."""
@@ -192,37 +198,27 @@ def strip_ansi_control_chars(text):
 def decode_line(line: bytes) -> str:
     """try decode line exception on binary"""
     try:
-        return strip_ansi_control_chars(line).decode().strip(" ")
+        return get_visible_output(line.decode()).strip(" ")
     except UnicodeDecodeError:
         return ""
 
 
-def last_line(fd, maxsize=500):
-    """last non empty line of file"""
-    line = "\n"
-    fd.seek(0, os.SEEK_END)
-    size = 0
-    last_pos = 0
-    while line in ["", "\n", "\r"] and size < maxsize:
-        try:  # catch if file empty / only empty lines
-            if last_pos:
-                fd.seek(last_pos-2, os.SEEK_SET)
-            while fd.read(1) not in [b"\n", b"\r"] and size < maxsize:
-                fd.seek(-2, os.SEEK_CUR)
-                size += 1
+def get_last_line(file_path, maxsize=1024):
+    """Retrieve last non empty line after vt100 interpretation"""
+    with open(file_path, 'rb') as fd:
+        try:
+            fd.seek(-maxsize, os.SEEK_END)
         except OSError:
             fd.seek(0)
-            line = decode_line(fd.readline())
-            break
-        last_pos = fd.tell()
-        line = decode_line(fd.readline())
-    return line.strip()
-
-
-def get_last_non_empty_line_of_file(file_path):
-    """Get the last non-empty line of a file."""
-    with open(file_path, 'rb') as f:
-        return last_line(f)
+        lines = fd.read().split(b"\n")
+        if len(lines) == 1:
+            return ""
+        line = ""
+        while True:
+            line = decode_line(lines.pop())
+            if line or not lines:
+                break
+        return line
     
 
 def start_gunicorn(daemonized=False, baselog=None):
@@ -435,7 +431,7 @@ def update_command_status(command_id, updates):
     if status_data['status'] != 'running':
         output_file_path = get_output_file_path(command_id)
         if os.path.exists(output_file_path):
-            status_data['last_output_line'] = get_last_non_empty_line_of_file(output_file_path)
+            status_data['last_output_line'] = get_last_line(output_file_path)
     with open(status_file_path, 'w') as f:
         json.dump(status_data, f)
     
@@ -577,7 +573,7 @@ def read_commands():
                 if last_line is None:
                     output_file_path = get_output_file_path(command_id)
                     if os.path.exists(output_file_path):
-                        last_line = get_last_non_empty_line_of_file(output_file_path)
+                        last_line = get_last_line(output_file_path)
                 commands.append({
                     'command_id': command_id,
                     'status': status['status'],

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.11'
-__version_tuple__ = version_tuple = (1, 6, 11)
+__version__ = version = '1.6.13'
+__version_tuple__ = version_tuple = (1, 6, 13)

{pywebexec-1.6.11.dist-info → pywebexec-1.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.6.11
+Version: 1.6.13
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -59,6 +59,7 @@ Requires-Dist: Flask-HTTPAuth>=4.8.0
 Requires-Dist: pexpect>=4.9.0
 Requires-Dist: gunicorn>=21.2.0
 Requires-Dist: ldap3>=2.9.1
+Requires-Dist: pyte>=0.8.1
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![example](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)

{pywebexec-1.6.11.dist-info → pywebexec-1.6.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=CLHDHDkgsftj8VWKp6ofnUgM8oQf8rvCvROlnljP4ow,32577
-pywebexec/version.py,sha256=fbMgF3ll0MwJN-g_yFfiW2LYnfAEawaw32LMtGtBPy8,413
+pywebexec/pywebexec.py,sha256=hE7O0lZgg_nMk1VIFlBUv6lJ6T5sJFFBycnDmVnRQg4,32518
+pywebexec/version.py,sha256=F6yOQF2i7n8OMZVy5diTWAk2RoBPwyUW2P5AsaXwnHo,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=MJHUBpjWL4sLxM7a7DxypmPKaFJQbmA_ESNXsbLviNI,8201
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -33,9 +33,9 @@ pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCf
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=5h8kLyzAhbvUDU9sEwrGIvD6FxAMcDZLXlN-ldlO8KU,2880
 pywebexec/templates/popup.html,sha256=3ZqQcE9mYs-RXv0Lfb24zntOlvR137ZYI9mtCZNVAo0,1407
-pywebexec-1.6.11.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.6.11.dist-info/METADATA,sha256=Do6KMuv1dJL4UjCD-ypdImK1RMOxiGRBnDC0u6uNPoM,7974
-pywebexec-1.6.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.6.11.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.6.11.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.6.11.dist-info/RECORD,,
+pywebexec-1.6.13.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.6.13.dist-info/METADATA,sha256=zXXihO8zyUycPpw9EBZK_YbKa9-P4PcHR-RPPPSQ-Qc,8001
+pywebexec-1.6.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.6.13.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.6.13.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.6.13.dist-info/RECORD,,