pywebexec 2.3.13__py3-none-any.whl → 2.3.14__py3-none-any.whl

pywebexec/pywebexec.py

@@ -22,7 +22,7 @@ if platform.system() != 'Windows':
     import termios
 else:
     from waitress import serve
-    from winpty import PtyProcess, WinptyError
+    from winpty import PTY, WinptyError
 import ipaddress
 from socket import socket, AF_INET, SOCK_STREAM
 import ssl
@@ -513,7 +513,6 @@ def script(output_file):
         signal.signal(signal.SIGWINCH, sigwinch_passthrough)
         p.interact()
 
-
 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()
@@ -545,21 +544,25 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
         elif platform.system() == 'Windows':
             # On Windows, use winpty
             with open(output_file_path, 'wb', buffering=0) as fd:
-                p = PtyProcess.spawn([sys.executable, "-u", command, *params], dimensions=(rows, cols))
-                pid = p.pid
+                p = PTY(cols, rows)
+                p.spawn(subprocess.list2cmdline([sys.executable, "-u", command, *params]))
                 update_command_status(command_id, {
-                    'pid': pid,
+                    'pid': p.pid,
                 })
                 while True:
                     try:
-                        data = p.fileobj.recv(10485760)
-                        if not data:
+                        # sleep less than 0.1s to get full output after command ends
+                        # pty won't be readable 0.1s after command ends
+                        time.sleep(0.09)
+                        # cannot use blocking read as it will block forever if no output at end of commandgit d
+                        data = p.read(10485760, blocking=False)
+                        fd.write(data.encode())
+                        if not p.isalive():
                             break
-                        fd.write(data)
                     except (EOFError, WinptyError):
                         break
-                status = p.exitstatus
-                p.close()
+                status = p.get_exitstatus()
+                del p
         else:
             # On Unix, use pexpect
             with open(output_file_path, 'wb') as fd:
@@ -575,29 +578,29 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
         end_time = datetime.now(timezone.utc).isoformat()
         # Update the status based on the result
         if status is None:
-            exit_code = -15
+            status = -15
+        if status in [15, -15] :
             update_command_status(command_id, {
                 'status': 'aborted',
                 'end_time': end_time,
-                'exit_code': exit_code,
+                'exit_code': status,
             })
             log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: command aborted')
         else:
-            exit_code = status
-            if exit_code == 0:
+            if status == 0:
                 update_command_status(command_id, {
                     'status': 'success',
                     'end_time': end_time,
-                    'exit_code': exit_code,
+                    'exit_code': status,
                 })
                 log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: completed successfully')
             else:
                 update_command_status(command_id, {
                     'status': 'failed',
                     'end_time': end_time,
-                    'exit_code': exit_code,
+                    'exit_code': status,
                 })
-                log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: exit code {exit_code}')
+                log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: exit code {status}')
 
     except Exception as e:
         end_time = datetime.now(timezone.utc).isoformat()
@@ -609,8 +612,8 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
         with open(get_output_file_path(command_id), 'a') as output_file:
             output_file.write(str(e))
         app.logger.error(fromip, user, f'Error running command {command_id}: {e}')
-        exit_code = 1
-    return exit_code
+        status = 1
+    return status
 
 def command_str(command, params):
     try:
@@ -735,9 +738,9 @@ def stop_command(command_id):
     end_time = datetime.now(timezone.utc).isoformat()
     try:
         try:
-            os.killpg(os.getpgid(pid), signal.SIGTERM)  # Send SIGTERM to the process group
+            os.killpg(os.getpgid(pid), signal.SIGTERM)
         except:
-            os.kill(pid, signal.SIGINT)  # Send SIGTERM to the process
+            os.kill(pid, signal.SIGTERM)
     except Exception as e:
         update_command_status(command_id, {
             'status': 'aborted',

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.13'
-__version_tuple__ = version_tuple = (2, 3, 13)
+__version__ = version = '2.3.14'
+__version_tuple__ = version_tuple = (2, 3, 14)

{pywebexec-2.3.13.dist-info → pywebexec-2.3.14.dist-info}/METADATA

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

{pywebexec-2.3.13.dist-info → pywebexec-2.3.14.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
-pywebexec/pywebexec.py,sha256=iQsFNCjh_vWOVSPQuSJVHnNecYoM3i_o_fTIdcPLNEc,48241
+pywebexec/pywebexec.py,sha256=NT4f7Xd4qMkAgjgwguqKKbUkOTCqT7ArRYlsW57Pfwg,48477
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=g7JB3-xSQEFZqMm5-StvX0lwySFF3upByJIPluxkg7Y,513
+pywebexec/version.py,sha256=Aelhd_nWH-KFOx_jUKbvGukd7h0Q1WZNZKS7Tu4SHi0,513
 pywebexec/static/css/form.css,sha256=riFFi02xtUXusTTZOU3RSZykutJWMFfK65-eR5RbhY8,7252
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=pUmylXwbFIoXrdaJRVOUohlKIhOIilapH97NyIlgGV4,10343
@@ -67,9 +67,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.3.13.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.3.13.dist-info/METADATA,sha256=wkQVPjtyJ3gvD-TRYBbkUr9506YH2jO2qUl5dxNxqak,13016
-pywebexec-2.3.13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pywebexec-2.3.13.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.3.13.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.3.13.dist-info/RECORD,,
+pywebexec-2.3.14.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.3.14.dist-info/METADATA,sha256=8PDed7Qx0Rfvb3OExe836rpjUEZDoGgTcqQFHhhpvWA,13016
+pywebexec-2.3.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.3.14.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.3.14.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.3.14.dist-info/RECORD,,