pywebexec 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

pywebexec/pywebexec.py

@@ -22,7 +22,7 @@ if platform.system() != 'Windows':
     import termios
 else:
     from waitress import serve
-    import winpty
+    from winpty import PtyProcess, WinptyError
 import ipaddress
 from socket import socket, AF_INET, SOCK_STREAM
 import ssl
@@ -72,6 +72,7 @@ CONFDIR += "/.pywebexec"
 term_command_id = str(uuid.uuid4())
 tty_cols = 125
 tty_rows = 30
+os.environ["PYWEBEXEC"] = "true"
 
 # In-memory cache for command statuses
 status_cache = {}
@@ -364,6 +365,7 @@ def parseargs():
     parser.add_argument("-k", "--key", type=str, help="Path to https certificate key")
     parser.add_argument("-g", "--gencert", action="store_true", help="https server self signed cert")
     parser.add_argument("-T", "--tokenurl", action="store_true", help="generate safe url to access")
+    parser.add_argument("-n", "--notty", action="store_true", help="no span commands in tty")
     parser.add_argument("-C", "--cols", type=int, default=tty_cols, help="terminal columns")
     parser.add_argument("-R", "--rows", type=int, default=tty_rows, help="terminal rows")
     parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status/shareterm/term",
@@ -529,12 +531,21 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
     })
     output_file_path = get_output_file_path(command_id)
     try:
-        if platform.system() == 'Windows':
+        if args.notty:
+            os.environ["PYTHONIOENCODING"] = "utf-8"
+            os.environ["PYTHONLEGACYWINDOWSSTDIO"] = "utf-8"
+            with open(output_file_path, 'wb', buffering=0) as fd:
+                p = subprocess.Popen([sys.executable, "-u", command, *params], stdout=fd, stderr=fd, bufsize=1, text=False)
+                pid = p.pid
+                update_command_status(command_id, {
+                    'pid': pid,
+                })
+                p.wait()
+                status = p.returncode
+        elif platform.system() == 'Windows':
             # On Windows, use winpty
-            cmdline = f"{sys.executable} -u {command} " + " ".join(shlex.quote(p) for p in params)
             with open(output_file_path, 'wb', buffering=0) as fd:
-                p = winpty.PTY(cols, rows)
-                p.spawn(cmdline)
+                p = PtyProcess.spawn([sys.executable, "-u", command, *params], dimensions=(rows, cols))
                 pid = p.pid
                 update_command_status(command_id, {
                     'pid': pid,
@@ -543,16 +554,15 @@ def run_command(fromip, user, command, params, command_id, rows, cols):
                     try:
                         if not p.isalive():
                             time.sleep(1)
-                        data = p.read(10485760, blocking=False)
+                        data = p.read(10485760)
                         fd.write(data.encode())
                         if not p.isalive():
                             break
                         time.sleep(0.1)
-                    except (EOFError, winpty.WinptyError):
+                    except (EOFError, WinptyError):
                         break
-                status = p.get_exitstatus()
-                del p
-                print("end", status)
+                status = p.exitstatus
+                p.close()
         else:
             # On Unix, use pexpect
             with open(output_file_path, 'wb') as fd:

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.3.1'
+__version_tuple__ = version_tuple = (2, 3, 1)

{pywebexec-2.3.0.dist-info → pywebexec-2.3.1.dist-info}/METADATA

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

{pywebexec-2.3.0.dist-info → pywebexec-2.3.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=q2q4NVgWeMmAegM-iK8J9B175snHyHkW45WYPlHYJpQ,47727
+pywebexec/pywebexec.py,sha256=LD917ZeDVnOSMuLWPkl9JT1baaDvZ_e0Yk7RTs5yBfk,48273
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=U--yqU7RFo8hQQm8oopUGYLkafj4phNIVfkf5HFEal8,511
+pywebexec/version.py,sha256=4lLWfgycoQE7rafXKcKQeSzbG6DAo6_kH0qn9J_0diQ,511
 pywebexec/static/css/form.css,sha256=XC_0ES5yMHYz0S2OHR0RAboQN7fBUmg5ZIq8Qm5rHP0,5806
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=R1VOPNV2ztROKy9Fgf3tvUrtuKagY027tFJ8C866yWU,9991
@@ -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.0.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.3.0.dist-info/METADATA,sha256=y1F2WI5mfVSDdt_GznPWBmK07NrToa8qOjSqls1r0kM,13015
-pywebexec-2.3.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-pywebexec-2.3.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.3.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.3.0.dist-info/RECORD,,
+pywebexec-2.3.1.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.3.1.dist-info/METADATA,sha256=7CcAZIQPHq5Y_txEFyDwBzSRE1o4TPyJYHgZtSeQvuM,13015
+pywebexec-2.3.1.dist-info/WHEEL,sha256=L0N565qmK-3nM2eBoMNFszYJ_MTx03_tQ0CQu1bHLYo,91
+pywebexec-2.3.1.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.3.1.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.3.1.dist-info/RECORD,,

{pywebexec-2.3.0.dist-info → pywebexec-2.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any