pywebexec 1.6.16__py3-none-any.whl → 1.7.0__py3-none-any.whl

pywebexec/pywebexec.py

@@ -58,7 +58,7 @@ CONFDIR += "/.pywebexec"
 term_command_id = str(uuid.uuid4())
 
 # In-memory cache for command statuses
-command_status_cache = {}
+status_cache = {}
 
 def generate_random_password(length=12):
     characters = string.ascii_letters + string.digits + string.punctuation
@@ -162,7 +162,6 @@ def generate_selfsigned_cert(hostname, ip_addresses=None, key=None):
     return cert_pem, key_pem
 
 
-
 class PyWebExec(Application):
 
     def __init__(self, app, options=None):
@@ -180,18 +179,6 @@ class PyWebExec(Application):
 
     def load(self):
         return self.application
-
-def get_visible_output(line):
-    try:
-        screen = pyte.Screen(len(line)+1, 2)
-        stream = pyte.Stream(screen)
-        stream.feed(line)
-        visible_line = screen.display[1].strip(" ")
-        if visible_line:
-            return visible_line
-        return screen.display[0].strip(" ")
-    except:
-        return ""
                                                                                                     #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])')
 
@@ -208,22 +195,34 @@ def decode_line(line: bytes) -> str:
         return ""
 
 
-def get_last_line(file_path, maxsize=1024):
+def get_visible_output(line, cols, rows):
+    """pyte vt100 render to get last line"""
+    try:
+        screen = pyte.Screen(cols, rows)
+        stream = pyte.ByteStream(screen)
+        stream.feed(line)
+        visible_line = ""
+        row = rows - 1
+        while row > 0:
+            visible_line = screen.display[row].strip(" ")
+            if visible_line:
+                return visible_line
+            row -= 1
+    except:
+        return ""
+    return ""
+
+
+def get_last_line(file_path, cols=None, rows=None, maxsize=2048):
     """Retrieve last non empty line after vt100 interpretation"""
+    cols = cols or 125
+    rows = rows or 24
     with open(file_path, 'rb') as fd:
         try:
             fd.seek(-maxsize, os.SEEK_END)
         except OSError:
             fd.seek(0)
-        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
+        return get_visible_output(fd.read(), cols, rows)
     
 
 def start_gunicorn(daemonized=False, baselog=None):
@@ -242,7 +241,8 @@ def start_gunicorn(daemonized=False, baselog=None):
         accesslog = None #"-"
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
-        'workers': 4,
+        'workers': 1,
+        'threads': 4,
         'timeout': 600,
         'certfile': args.cert,
         'keyfile': args.key,
@@ -431,39 +431,33 @@ def get_output_file_path(command_id):
 
 def update_command_status(command_id, updates):
     status_file_path = get_status_file_path(command_id)
-    status_data = read_command_status(command_id) or {}
-    status_data.update(updates)
-    if status_data['status'] != 'running':
+    status = read_command_status(command_id) or {}
+    status.update(updates)
+    if status.get('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_line(output_file_path)
+            status['last_output_line'] = get_last_line(output_file_path, status.get('cols'), status.get('rows'))
+    status_cache[command_id] = status
     with open(status_file_path, 'w') as f:
-        json.dump(status_data, f)
+        json.dump(status, f)
     
-    # Update cache if status is not "running"
-    if status_data['status'] != 'running':
-        command_status_cache[command_id] = status_data
-    elif command_id in command_status_cache:
-        del command_status_cache[command_id]
-
 def read_command_status(command_id):
     # Return cached status if available
-    if command_id in command_status_cache:
-        return command_status_cache[command_id]
-    
+    status_data = {}
+    if command_id in status_cache:
+        status_data = status_cache[command_id]
+    status = status_data.get('status')
+    if status and status != "running":
+        return status_data
     status_file_path = get_status_file_path(command_id)
     if not os.path.exists(status_file_path):
         return None
     with open(status_file_path, 'r') as f:
         try:
-            status_data = json.load(f)
+            status_data.update(json.load(f))
         except json.JSONDecodeError:
             return None
-    
-    # Cache the status if it is not "running"
-    if status_data['status'] != 'running':
-        command_status_cache[command_id] = status_data
-    
+    status_cache[command_id] = status_data
     return status_data
 
 def sigwinch_passthrough(sig, data):
@@ -567,6 +561,7 @@ def command_str(command, params):
 
 
 def read_commands():
+    global status_cache
     commands = []
     for filename in os.listdir(COMMAND_STATUS_DIR):
         if filename.endswith('.json'):
@@ -574,19 +569,25 @@ def read_commands():
             status = read_command_status(command_id)
             if status:
                 command = command_str(status.get('command', '-'), status.get('params', []))
-                last_line = status.get('last_output_line')
-                if last_line is None:
+                if status.get('status') == 'running' and status.get('last_update',0)<datetime.now().timestamp()-5:
                     output_file_path = get_output_file_path(command_id)
                     if os.path.exists(output_file_path):
-                        last_line = get_last_line(output_file_path)
+                        size = os.path.getsize(output_file_path)
+                        if size != status.get('size'):
+                            status.update({
+                                'size': size,
+                                'last_update': datetime.now().timestamp(),
+                                'last_output_line': get_last_line(output_file_path, status.get('cols'), status.get('rows')),
+                            })
+                            status_cache[command_id] = status
                 commands.append({
                     'command_id': command_id,
-                    'status': status['status'],
+                    'status': status.get('status'),
                     'start_time': status.get('start_time', 'N/A'),
                     'end_time': status.get('end_time', 'N/A'),
                     'command': command,
                     'exit_code': status.get('exit_code', 'N/A'),
-                    'last_output_line': last_line,
+                    'last_output_line': status.get('last_output_line'),
                 })
     return commands
 

pywebexec/static/js/script.js

@@ -120,7 +120,7 @@ document.getElementById('launchForm').addEventListener('submit', async (event) =
             throw new Error('Failed to launch command');
         }
         const data = await response.json();
-        await new Promise(r => setTimeout(r, 300));
+        //await new Promise(r => setTimeout(r, 300));// not ok
         fetchCommands();
         viewOutput(data.command_id);
         commandInput.focus()

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.16'
-__version_tuple__ = version_tuple = (1, 6, 16)
+__version__ = version = '1.7.0'
+__version_tuple__ = version_tuple = (1, 7, 0)

{pywebexec-1.6.16.dist-info → pywebexec-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.6.16
+Version: 1.7.0
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.6.16.dist-info → pywebexec-1.7.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=bfE0QBiErt3k5GCsobOLZOP5OT6JJs-39GvLkzWqnB0,32650
-pywebexec/version.py,sha256=Krs1A6GFKeSDM3HlmJuBHtdakqIKMggtBrGf0aTD85E,413
+pywebexec/pywebexec.py,sha256=J5cPqvF8OfdKAmuvNiRgVIGsiromBBdK1Nna80tNPro,33006
+pywebexec/version.py,sha256=2fEqxujmrV2dsREie2BmOYFLu66FowyHtZT2AoLuIzU,411
 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
@@ -20,7 +20,7 @@ pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/js/commands.js,sha256=h2fkd9qpypLBxvhEEbay23nwuqUwcKJA0vHugcyL8pU,7961
 pywebexec/static/js/popup.js,sha256=I5TLYUm5s2p12a0VfFONOxxzhXLBmnpVzM-B5W-GPis,8294
-pywebexec/static/js/script.js,sha256=8CcIn-O4I1ojbiAYOeQl3yTnykn0Lj3xdWdx6m6HyNs,17085
+pywebexec/static/js/script.js,sha256=EPofQO0ec2bwIr2YdzzNY3dcXipW2_Mi2j34DIYvJeE,17096
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/addon-canvas.js,sha256=ez6QTVvsmLVNJmdJlM-ZQ5bErwlxAQ_9DUmDIptl2TM,94607
 pywebexec/static/js/xterm/addon-canvas.js.map,sha256=ECBA4B-BqUpdFeRzlsEWLSQnudnhLP-yPQJ8_hKquMo,379537
@@ -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.16.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.6.16.dist-info/METADATA,sha256=sU0xp2d2_UIe1pvIdJKvnZ3zK7ThZ7jueOKNVssIu3o,8001
-pywebexec-1.6.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.6.16.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.6.16.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.6.16.dist-info/RECORD,,
+pywebexec-1.7.0.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.7.0.dist-info/METADATA,sha256=qEu0SeeVHBVgAhPPeM2Fe8Rhq6RhGNaPudJyJS1t-3k,8000
+pywebexec-1.7.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.7.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.7.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.7.0.dist-info/RECORD,,