pywebexec 1.7.16__py3-none-any.whl → 1.7.19__py3-none-any.whl

pywebexec/pywebexec.py

@@ -25,6 +25,7 @@ import termios
 import struct
 import subprocess
 import logging
+from pathlib import Path
 import pyte
 from . import host_ip
 
@@ -404,14 +405,16 @@ def get_output_file_path(command_id):
 def update_command_status(command_id, updates):
     status_file_path = get_status_file_path(command_id)
     status = read_command_status(command_id) or {}
+    status = status.copy()
     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['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, f)
+    os.sync()
+    status_cache[command_id] = status
 
 
 def read_command_status(command_id):
@@ -465,7 +468,6 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}')
     start_time = datetime.now(timezone.utc).isoformat()
     update_command_status(command_id, {
-        'status': 'running',
         'command': command,
         'params': params,
         'start_time': start_time,
@@ -492,7 +494,6 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
                     'status': 'aborted',
                     'end_time': end_time,
                     'exit_code': exit_code,
-                    'user': user
                 })
                 log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: command aborted')
             else:
@@ -502,7 +503,6 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
                         'status': 'success',
                         'end_time': end_time,
                         'exit_code': exit_code,
-                        'user': user
                     })
                     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: completed successfully')
                 else:
@@ -510,7 +510,6 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
                         'status': 'failed',
                         'end_time': end_time,
                         'exit_code': exit_code,
-                        'user': user
                     })
                     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: exit code {exit_code}')
 
@@ -520,7 +519,6 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
             'status': 'failed',
             'end_time': end_time,
             'exit_code': 1,
-            'user': user
         })
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
@@ -720,6 +718,7 @@ def run_command_endpoint():
         'from': request.remote_addr,
     })
 
+    Path(get_output_file_path(command_id)).touch()
     # Run the command in a separate thread
     thread = threading.Thread(target=run_command, args=(request.remote_addr, user, command_path, params, command_id, rows, cols))
     thread.start()

pywebexec/static/js/script.js

@@ -270,7 +270,7 @@ async function viewOutput(command_id) {
     try {
         const response = await fetch(`/command_status/${command_id}${urlToken}`);
         if (!response.ok) {
-            return;
+            outputInterval = setInterval(() => fetchOutput(nextOutputLink), 500);
         }
         const data = await response.json();
         const commandInfo = document.getElementById('commandInfo');
@@ -428,7 +428,7 @@ function sliderUpdateOutput()
 {
     const percentage = slider.value/10;
     outputLength = Math.floor((fullOutput.length * percentage) / 100);
-    const limitedOutput = fullOutput.slice(0, outputLength);
+    limitedOutput = fullOutput.slice(0, outputLength);
     terminal.clear();
     terminal.reset();
     terminal.write(limitedOutput);

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.16'
-__version_tuple__ = version_tuple = (1, 7, 16)
+__version__ = version = '1.7.19'
+__version_tuple__ = version_tuple = (1, 7, 19)

{pywebexec-1.7.16.dist-info → pywebexec-1.7.19.dist-info}/METADATA

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

{pywebexec-1.7.16.dist-info → pywebexec-1.7.19.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=p8R2BUIhfn84FDg4AYnctzxoLyDGKrt4kFPo70srdzM,32651
-pywebexec/version.py,sha256=WdsVJyJd332VXBIeonNxp-N9uxd6YY3neptgUO8uJGI,513
+pywebexec/pywebexec.py,sha256=gMkPagOLSc_8OUGxQJBKbwPivyQVK5og8-NgyR6xRl4,32607
+pywebexec/version.py,sha256=TkFaFsruX5Otm0LH6piM1yaTwAuulEqgHrPqtArFw5s,513
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=fU-_eAk6Xy0L_GbH9rJBkeCFe5M2RYQA99cvRZ3pW9w,7934
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -23,7 +23,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=TmfcauQlfIeAeC8pwQvKspc4PA_VYLbPTnVCDVBZ87I,8420
 pywebexec/static/js/popup.js,sha256=_2GzUizJ-sdZFWG7SZwbYJTPbu4EvVq7D5Q_UE8nepA,9452
-pywebexec/static/js/script.js,sha256=bmaR9TJhZMEK_Niz0TCp8CJdnLKh4ayaxLvqgjxdoRs,18482
+pywebexec/static/js/script.js,sha256=0vyxfgYYPsnnfscn11YcFYDyDYwmIGEVTe0dx0UJIqA,18538
 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
@@ -36,9 +36,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=KSdQYBdzWKP6v0ETZsMO_729aosGBAzJxAss8T5jCto,2953
 pywebexec/templates/popup.html,sha256=f5m4u8WKpkevL2mQamGqo4_y-rSuLOXGuNsezuUbniY,1508
-pywebexec-1.7.16.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.16.dist-info/METADATA,sha256=YIzS2E50FTLAFyhl9fHUGsIdMOHpW7q0ZVhqY6Jipqs,8147
-pywebexec-1.7.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.16.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.16.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.16.dist-info/RECORD,,
+pywebexec-1.7.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.7.19.dist-info/METADATA,sha256=yD7jkQlQGWpQfEYpoZ62JpLU4wjW8jEYn6uk9NjD5tc,8147
+pywebexec-1.7.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.7.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.7.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.7.19.dist-info/RECORD,,