pywebexec 1.7.18__py3-none-any.whl → 1.8.0__py3-none-any.whl

pywebexec/pywebexec.py

@@ -404,37 +404,42 @@ 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 = read_command_status(command_id)
     status.update(updates)
+    status = status.copy()
     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
+    if 'last_read' in status:
+        del status['last_read']
     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):
     # Return cached status if available
-    status_data = {}
-    if command_id in status_cache:
-        status_data = status_cache[command_id]
+    global status_cache
+    if not command_id in status_cache:
+        status_cache[command_id] = {}
+    status_data = status_cache[command_id]
     status = status_data.get('status')
     if status and status != "running":
         return status_data
-    if command_id in status_cache and status_cache.get('last_read',0)>datetime.now().timestamp()-0.5:
+    if status_data.get('last_read',0)>datetime.now().timestamp()-0.5:
         return status_data
     status_file_path = get_status_file_path(command_id)
     if not os.path.exists(status_file_path):
-        return None
+        return status_data
     with open(status_file_path, 'r') as f:
         try:
             status_data.update(json.load(f))
         except json.JSONDecodeError:
-            return None
+            return status_data
     status_data['last_read'] = datetime.now().timestamp()
-    status_cache[command_id] = status_data
+    #status_cache[command_id] = status_data
     return status_data
 
 def sigwinch_passthrough(sig, data):
@@ -466,7 +471,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,
@@ -493,7 +497,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:
@@ -503,7 +506,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:
@@ -511,7 +513,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}')
 
@@ -521,7 +522,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))
@@ -555,7 +555,6 @@ def read_commands():
                                 '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.get('status'),
@@ -733,13 +732,6 @@ def get_command_status(command_id):
     status = read_command_status(command_id)
     if not status:
         return jsonify({'error': 'Invalid command_id'}), 404
-
-    # output_file_path = get_output_file_path(command_id)
-    # if os.path.exists(output_file_path):
-    #     with open(output_file_path, 'r') as output_file:
-    #         output = output_file.read()
-    #     status['output'] = output
-
     return jsonify(status)
 
 @app.route('/')
@@ -759,11 +751,16 @@ def get_command_output(command_id):
     maxsize = int(request.args.get('maxsize', 10485760))
     output_file_path = get_output_file_path(command_id)
     if os.path.exists(output_file_path):
-        with open(output_file_path, 'rb') as output_file:
-            output_file.seek(offset)
-            output = output_file.read().decode('utf-8', errors='replace')
-            new_offset = output_file.tell()
-        status_data = read_command_status(command_id) or {}
+        size = os.path.getsize(output_file_path)
+        if offset >= size:
+            output = ''
+            new_offset = offset
+        else:
+            with open(output_file_path, 'rb') as output_file:
+                output_file.seek(offset)
+                output = output_file.read().decode('utf-8', errors='replace')
+                new_offset = output_file.tell()
+        status_data = read_command_status(command_id)
         token = app.config.get("TOKEN_URL")
         token_param = f"&token={token}" if token else ""
         response = {

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.18'
-__version_tuple__ = version_tuple = (1, 7, 18)
+__version__ = version = '1.8.0'
+__version_tuple__ = version_tuple = (1, 8, 0)

{pywebexec-1.7.18.dist-info → pywebexec-1.8.0.dist-info}/METADATA

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

{pywebexec-1.7.18.dist-info → pywebexec-1.8.0.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=j52h1x4VgVLgDZ6hTX-QMt7UbmDtO0MHg2EnLcmvcGQ,32727
-pywebexec/version.py,sha256=atP_5XTod1UHdqP67s_f64V3lP30xwHn22VXn1ZEIgM,513
+pywebexec/pywebexec.py,sha256=Pwsjq9VpM19l10-suEZ5nEXBv-LOaJNZy91ubuAkBos,32541
+pywebexec/version.py,sha256=NlHLpXkNFmTH52K5-WhbSOpEjuVpHwg6f2tUr8gHTCY,511
 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
@@ -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.18.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.18.dist-info/METADATA,sha256=uHZ987HDurDIzK2s6krXQHYXkpqjS91Z_uQiIaovs98,8147
-pywebexec-1.7.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.18.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.18.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.18.dist-info/RECORD,,
+pywebexec-1.8.0.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.8.0.dist-info/METADATA,sha256=BwYrBzm4blpnbGe0A1xwwobqIHCnIT211Jobsx9GpQg,8146
+pywebexec-1.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.8.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.8.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.8.0.dist-info/RECORD,,