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

pywebexec/host_ip.py

@@ -41,6 +41,8 @@ def resolve(host_or_ip):
 def get_host_ip(host_or_ip='0.0.0.0'):
     if host_or_ip == '0.0.0.0':
         return resolve(gethostname())
+    if host_or_ip in ('localhost', '127.0.0.1'):
+        return ('localhost', '127.0.0.1')
     return resolve(host_or_ip)
 
 if __name__ == '__main__':

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/static/css/style.css

@@ -55,6 +55,16 @@ th {
     overflow-y: hidden;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.60);
 }
+.outputhtml {
+    background: #fff;
+    padding: 0;
+    overflow: auto;
+    ul {
+        margin: 0;
+        padding: 0 15px;
+        width: fit-content;
+    }
+}
 .copy-icon {
     cursor: pointer;
 }

pywebexec/static/js/popup.js

@@ -104,6 +104,10 @@ function setCommandStatus(status) {
     document.getElementById("commandStatus").className = `status-icon status-${status}`;
 }
 
+function extractHtml(text) {
+    const match = text.match(/<html[\s\S]*?<\/html>/);
+    return match ? match[0] : null;
+}
 
 async function fetchOutput(url) {
     if (isPaused) return;
@@ -123,16 +127,33 @@ async function fetchOutput(url) {
                 rows = data.rows;
                 autoFit(false);
             }
-            percentage = slider.value;
             fullOutput += data.output;
             if (fullOutput.length > maxSize)
                 fullOutput = fullOutput.slice(-maxSize);
-            if (percentage == 1000)
-                terminal.write(data.output);
-            else {
-                percentage = Math.round((outputLength * 1000)/fullOutput.length);
-                slider.value = percentage;
-                document.getElementById('outputPercentage').innerText = `${Math.floor(percentage/10)}%`;
+
+            if (data.status != 'running') {
+                const htmlContent = extractHtml(fullOutput);
+                if (htmlContent) {
+                    document.getElementById('output').innerHTML = htmlContent;
+                    document.getElementById('output').classList.add('outputhtml');
+                } else {
+                    document.getElementById('output').classList.remove('outputhtml');
+                    if (slider.value == 1000)
+                        terminal.write(data.output);
+                    else {
+                        percentage = Math.round((outputLength * 1000)/fullOutput.length);
+                        slider.value = percentage;
+                        document.getElementById('outputPercentage').innerText = `${Math.floor(percentage/10)}%`;
+                    }
+                }
+            } else {
+                if (slider.value == 1000)
+                    terminal.write(data.output);
+                else {
+                    percentage = Math.round((outputLength * 1000)/fullOutput.length);
+                    slider.value = percentage;
+                    document.getElementById('outputPercentage').innerText = `${Math.floor(percentage/10)}%`;
+                }
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
@@ -162,7 +183,6 @@ async function viewOutput(command_id) {
     terminal.reset();
     fullOutput = '';
     try {
-        // Updated endpoint below:
         const response = await fetch(`/commands/${command_id}`);
         if (!response.ok) {
             return;
@@ -186,8 +206,22 @@ async function viewOutput(command_id) {
             fetchOutput(nextOutputLink);
             outputInterval = setInterval(() => fetchOutput(nextOutputLink), 500);
             toggleButton.style.display = 'block';
+            document.getElementById('output').innerHTML = '';
+            document.getElementById('output').appendChild(terminal.element);
         } else {
-            fetchOutput(nextOutputLink);
+            const outputResponse = await fetch(nextOutputLink);
+            const outputData = await outputResponse.json();
+            const output = outputData.output;
+            const htmlContent = extractHtml(output);
+            if (htmlContent) {
+                document.getElementById('output').innerHTML = htmlContent;
+                document.getElementById('output').classList.add('outputhtml');
+            } else {
+                document.getElementById('output').classList.remove('outputhtml');
+                document.getElementById('output').innerHTML = '';
+                document.getElementById('output').appendChild(terminal.element);
+                terminal.write(output);
+            }
             toggleButton.style.display = 'none';
         }
     } catch (error) {

pywebexec/static/js/script.js

@@ -196,13 +196,16 @@ async function fetchCommands(hide=false) {
     }
 }
 
+function extractHtml(text) {
+    const match = text.match(/<html[\s\S]*?<\/html>/);
+    return match ? match[0] : null;
+}
+
 async function fetchOutput(url) {
     if (isPaused) return;
     try {
         const response = await fetch(url);
-        if (!response.ok) {
-            return;
-        }
+        if (!response.ok) return;
         const data = await response.json();
         if (data.error) {
             terminal.write(data.error);
@@ -216,12 +219,30 @@ async function fetchOutput(url) {
             fullOutput += data.output;
             if (fullOutput.length > maxSize)
                 fullOutput = fullOutput.slice(-maxSize);
-            if (slider.value == 1000)
-                terminal.write(data.output);
-            else {
-                percentage = Math.round((outputLength * 1000)/fullOutput.length);
-                slider.value = percentage;
-                outputPercentage.innerText = `${Math.floor(percentage/10)}%`;
+
+            if (data.status != 'running') {
+                const htmlContent = extractHtml(fullOutput);
+                if (htmlContent) {
+                    document.getElementById('output').innerHTML = htmlContent;
+                    document.getElementById('output').classList.add('outputhtml');
+                } else {
+                    document.getElementById('output').classList.remove('outputhtml');
+                    if (slider.value == 1000)
+                        terminal.write(data.output);
+                    else {
+                        percentage = Math.round((outputLength * 1000)/fullOutput.length);
+                        slider.value = percentage;
+                        outputPercentage.innerText = `${Math.floor(percentage/10)}%`;
+                    }
+                }
+            } else {
+                if (slider.value == 1000)
+                    terminal.write(data.output);
+                else {
+                    percentage = Math.round((outputLength * 1000)/fullOutput.length);
+                    slider.value = percentage;
+                    outputPercentage.innerText = `${Math.floor(percentage/10)}%`;
+                }
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
@@ -276,8 +297,22 @@ async function viewOutput(command_id) {
             fetchOutput(nextOutputLink);
             outputInterval = setInterval(() => fetchOutput(nextOutputLink), 500);
             toggleButton.style.display = 'block';
+            document.getElementById('output').innerHTML = '';
+            document.getElementById('output').appendChild(terminal.element);
         } else {
-            fetchOutput(nextOutputLink);
+            const outputResponse = await fetch(nextOutputLink);
+            const outputData = await outputResponse.json();
+            const output = outputData.output;
+            const htmlContent = extractHtml(output);
+            if (htmlContent) {
+                document.getElementById('output').innerHTML = htmlContent;
+                document.getElementById('output').classList.add('outputhtml');
+            } else {
+                document.getElementById('output').classList.remove('outputhtml');
+                document.getElementById('output').innerHTML = '';
+                document.getElementById('output').appendChild(terminal.element);
+                terminal.write(output);
+            }
             toggleButton.style.display = 'none';
         }
         fetchCommands(); // Refresh the command list to highlight the current command

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.2'
+__version_tuple__ = version_tuple = (2, 3, 2)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.3.0
+Version: 2.3.2
 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.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
+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=R9MtLgm19dJJGBULhjeOA69Z4XJij_vYIytb4O8GglA,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
+pywebexec/static/css/style.css,sha256=3Vytr8BMVMvDJlRWQy0Jfnv1jyDxaYm9irwlZT2fAHs,10152
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
 pywebexec/static/css/swagger-ui.css.map,sha256=dJy-xBn_htK4BNupTMIl33ddse7BXsrCdDJWlTJodnw,258842
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -34,9 +34,9 @@ pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
 pywebexec/static/js/executables.js,sha256=cTgCFHr_F9bFCirtfG_uR32vOY3vNUr4Ih3Wglj5lFc,11988
-pywebexec/static/js/popup.js,sha256=O3DEWnyb5yGW9tjODYycc-ujWndyAfnJMxulaQeogtc,9700
+pywebexec/static/js/popup.js,sha256=IaKmk2U2hEn-Nv6krf_PPW6LaG8NcpCkJKb7lUX0qZo,11457
 pywebexec/static/js/schemaform.js,sha256=NlFXFKJI53izxPXct3a5XiB1RhWGt0_EIp6o1HfsryU,9624
-pywebexec/static/js/script.js,sha256=yQP2dWwTObWbg6ROeKFxwYi1NfDd2gxEn2e3oL-FWL8,18379
+pywebexec/static/js/script.js,sha256=V9uJVcF56e275zwRamoCGgQ-5B8DnpkiiaBslrczsPI,20158
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
@@ -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.2.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.3.2.dist-info/METADATA,sha256=JeeyKi63mWtYod8YJjtNh8sTB9g8SPA1GZRJ4dLGfE8,13015
+pywebexec-2.3.2.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+pywebexec-2.3.2.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.3.2.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.3.2.dist-info/RECORD,,

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

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