pywebexec 1.7.5__py3-none-any.whl → 1.7.8__py3-none-any.whl

pywebexec/pywebexec.py

@@ -492,33 +492,31 @@ def script(output_file):
         p.interact()
 
 
-def run_command(fromip, user, command, params, command_id):
+def run_command(fromip, user, command, params, command_id, rows, cols):
     # app.logger.info(f'{fromip} run_command {command_id} {user}: {command} {params}')
     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}')
-    start_time = datetime.now().isoformat()
+    start_time = datetime.now(timezone.utc).isoformat()
     update_command_status(command_id, {
         'status': 'running',
         'command': command,
         'params': params,
         'start_time': start_time,
         'user': user,
-        'cols': tty_cols,
-        'rows': tty_rows,
+        'cols': cols,
+        'rows': rows,
     })
     output_file_path = get_output_file_path(command_id)
     try:
         with open(output_file_path, 'wb') as fd:
-            p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None, dimensions=(tty_rows, tty_cols))
+            p = pexpect.spawn(command, params, ignore_sighup=True, timeout=None, dimensions=(rows, cols))
             update_command_status(command_id, {
-                'status': 'running',
                 'pid': p.pid,
-                'user': user
             })
             p.logfile = fd
             p.expect(pexpect.EOF)
             fd.flush()
             status = p.wait()
-            end_time = datetime.now().isoformat()
+            end_time = datetime.now(timezone.utc).isoformat()
             # Update the status based on the result
             if status is None:
                 exit_code = -15
@@ -549,7 +547,7 @@ def run_command(fromip, user, command, params, command_id):
                     log_info(fromip, user, f'run_command {command_id}: {command_str(command, params)}: exit code {exit_code}')
 
     except Exception as e:
-        end_time = datetime.now().isoformat()
+        end_time = datetime.now(timezone.utc).isoformat()
         update_command_status(command_id, {
             'status': 'failed',
             'end_time': end_time,
@@ -617,7 +615,7 @@ def check_processes():
             status = read_command_status(command_id)
             if status.get('status') == 'running' and 'pid' in status:
                 if not is_process_alive(status['pid']):
-                    end_time = datetime.now().isoformat()
+                    end_time = datetime.now(timezone.utc).isoformat()
                     update_command_status(command_id, {
                         'status': 'aborted',
                         'end_time': end_time,
@@ -643,7 +641,7 @@ def stop_command(command_id):
         return jsonify({'error': 'Invalid command_id or command not running'}), 400
 
     pid = status['pid']
-    end_time = datetime.now().isoformat()
+    end_time = datetime.now(timezone.utc).isoformat()
     try:
         #update_command_status(command_id, 'aborted', end_time=end_time, exit_code=-15)
         os.killpg(os.getpgid(pid), 15)  # Send SIGTERM to the process group
@@ -725,6 +723,8 @@ def run_command_endpoint():
     data = request.json
     command = data.get('command')
     params = data.get('params', [])
+    rows = data.get('rows', tty_rows)
+    cols = data.get('cols', tty_cols)
 
     if not command:
         return jsonify({'error': 'command is required'}), 400
@@ -753,7 +753,7 @@ def run_command_endpoint():
     })
 
     # Run the command in a separate thread
-    thread = threading.Thread(target=run_command, args=(request.remote_addr, user, command_path, params, command_id))
+    thread = threading.Thread(target=run_command, args=(request.remote_addr, user, command_path, params, command_id, rows, cols))
     thread.start()
 
     return jsonify({'message': 'Command is running', 'command_id': command_id})

pywebexec/static/js/popup.js

@@ -134,12 +134,12 @@ async function fetchOutput(url) {
             fullOutput += data.output;
             if (fullOutput.length > maxSize)
                 fullOutput = fullOutput.slice(-maxSize);
-            if (percentage == 100)
+            if (percentage == 1000)
                 terminal.write(data.output);
             else {
-                percentage = Math.round((outputLength * 100)/fullOutput.length);
+                percentage = Math.round((outputLength * 1000)/fullOutput.length);
                 slider.value = percentage;
-                document.getElementById('outputPercentage').innerText = `${percentage}%`;
+                document.getElementById('outputPercentage').innerText = `${Math.floor(percentage/10)}%`;
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
@@ -160,7 +160,7 @@ async function fetchOutput(url) {
 }
 
 async function viewOutput(command_id) {
-    slider.value = 100;
+    slider.value = 1000;
     adjustOutputHeight();
     currentCommandId = command_id;
     nextOutputLink = `/command_output/${command_id}${urlToken}`;
@@ -207,18 +207,18 @@ function adjustOutputHeight() {
 }
 
 function sliderUpdateOutput() {
-    const percentage = slider.value;
+    const percentage = slider.value / 10;
     outputLength = Math.floor((fullOutput.length * percentage) / 100);
     const limitedOutput = fullOutput.slice(0, outputLength);
     terminal.clear();
     terminal.reset();
     terminal.write(limitedOutput);
-    document.getElementById('outputPercentage').innerText = `${percentage}%`;
+    document.getElementById('outputPercentage').innerText = `${Math.floor(percentage)}%`;
 }
 
 function toggleFetchOutput() {
     if (isPaused) {
-        slider.value = 100;
+        slider.value = 1000;
         document.getElementById('outputPercentage').innerText = '100%';
         terminal.clear();
         terminal.reset();

pywebexec/static/js/script.js

@@ -128,13 +128,15 @@ document.getElementById('launchForm').addEventListener('submit', async (event) =
     event.preventDefault();
     const commandName = document.getElementById('commandName').value;
     const params = document.getElementById('params').value.split(' ');
+    fitAddon.fit();
+    terminal.clear();
     try {
         const response = await fetch(`/run_command${urlToken}`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json'
             },
-            body: JSON.stringify({ command: commandName, params: params })
+            body: JSON.stringify({ command: commandName, params: params, rows: terminal.rows, cols: terminal.cols })
         });
         if (!response.ok) {
             throw new Error('Failed to launch command');
@@ -228,12 +230,12 @@ async function fetchOutput(url) {
             fullOutput += data.output;
             if (fullOutput.length > maxSize)
                 fullOutput = fullOutput.slice(-maxSize);
-            if (slider.value == 100)
-                terminal.write(data.output); //.replace(/ \r/g, "\r\n")); tty size mismatch
+            if (slider.value == 1000)
+                terminal.write(data.output);
             else {
-                percentage = Math.round((outputLength * 100)/fullOutput.length);
+                percentage = Math.round((outputLength * 1000)/fullOutput.length);
                 slider.value = percentage;
-                outputPercentage.innerText = `${percentage}%`;
+                outputPercentage.innerText = `${Math.floor(percentage/10)}%`;
             }
             nextOutputLink = data.links.next;
             if (data.status != 'running') {
@@ -256,7 +258,7 @@ function setCommandStatus(status) {
 }
 
 async function viewOutput(command_id) {
-    slider.value = 100;
+    slider.value = 1000;
     outputPercentage.innerText = '100%';
     adjustOutputHeight();
     currentCommandId = command_id;
@@ -314,6 +316,8 @@ async function relaunchCommand(command_id, event) {
             alert(data.error);
             return;
         }
+        fitAddon.fit();
+        terminal.clear();
         const relaunchResponse = await fetch(`/run_command${urlToken}`, {
             method: 'POST',
             headers: {
@@ -321,7 +325,9 @@ async function relaunchCommand(command_id, event) {
             },
             body: JSON.stringify({
                 command: data.command,
-                params: data.params
+                params: data.params,
+                rows: terminal.rows,
+                cols: terminal.cols,
             })
         });
         if (!relaunchResponse.ok) {
@@ -420,13 +426,13 @@ function initResizer() {
 
 function sliderUpdateOutput()
 {
-    const percentage = slider.value;
+    const percentage = slider.value/10;
     outputLength = Math.floor((fullOutput.length * percentage) / 100);
     const limitedOutput = fullOutput.slice(0, outputLength);
     terminal.clear();
     terminal.reset();
     terminal.write(limitedOutput);
-    outputPercentage.innerText = `${percentage}%`;
+    outputPercentage.innerText = `${Math.floor(percentage)}%`;
 }
 
 slider.addEventListener('input', sliderUpdateOutput);

pywebexec/templates/index.html

@@ -47,7 +47,7 @@
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
         <span class="command-info"><span id="commandStatus" class="status-icon"></span><span id="commandInfo"></span></span>
-        <input type="range" id="outputSlider" min="0" max="100" value="100">
+        <input type="range" id="outputSlider" min="0" max="1000" value="1000">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>
         <button id="decreaseFontSize" class="font-size-button font-decrease"></button>

pywebexec/templates/popup.html

@@ -15,7 +15,7 @@
     <div id="pausedMessage" class="paused-message">Paused</div>
     <div class="slider-container">
         <span class="command-info"><span id="commandStatus"></span><span id="commandInfo"></span></span>
-        <input type="range" id="outputSlider" min="0" max="100" value="100">
+        <input type="range" id="outputSlider" min="0" max="1000" value="1000">
         <label for="outputSlider"><span id="outputPercentage">100%</span></label>
         <button id="toggleFetch" class="pause-resume-button pause"></button>
         <button id="decreaseFontSize" class="font-size-button font-decrease"></button>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.5'
-__version_tuple__ = version_tuple = (1, 7, 5)
+__version__ = version = '1.7.8'
+__version_tuple__ = version_tuple = (1, 7, 8)

{pywebexec-1.7.5.dist-info → pywebexec-1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.7.5
+Version: 1.7.8
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -199,7 +199,7 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 
 | method    | route                       | params/payload     | returns
 |-----------|-----------------------------|--------------------|---------------------|
-| POST      | /run_command                | command: str<br>params: array[str]       | command_id: uuid<br>message: str    |
+| POST      | /run_command                | command: str<br>params: array[str]<br>rows: int<br>cols: int       | command_id: uuid<br>message: str    |
 | POST      | /stop_command/command_id    |                    | message: str        |
 | GET       | /command_status/command_id  |                    | command_id: uuid<br>command: str<br>params: array[str]<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |

{pywebexec-1.7.5.dist-info → pywebexec-1.7.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=VBR6KmRiHNCd0ZvGEu_5sTqzVrUEPBhM8Hi6knS1QcA,33526
-pywebexec/version.py,sha256=1PmSWdbIl6FG3GO33tTDihvotemU0-1S8uTOfaXKRIY,411
+pywebexec/pywebexec.py,sha256=MmpHK2SscvIPj1gmV9AcJXYfeaL-at5BDgLhKIxzZBc,33604
+pywebexec/version.py,sha256=NhHD0wua0K7wHcsWg_CFF2Q9IzP5fWP-0bSHZe_REbQ,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
 pywebexec/static/css/style.css,sha256=3s7QgbCh4wb7kfZ7Pjo-B6o3lDIBogZ-3j6AfaPdpzU,8209
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -21,8 +21,8 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/js/commands.js,sha256=h2fkd9qpypLBxvhEEbay23nwuqUwcKJA0vHugcyL8pU,7961
-pywebexec/static/js/popup.js,sha256=oVkwnOKHae11omBiTZs-00NVeS9HGNEiUo71JSwOqn4,9382
-pywebexec/static/js/script.js,sha256=TtniIzVgYa9A0nXPS13MpcGyGZfrM-r8eb0pmpqgXJA,18301
+pywebexec/static/js/popup.js,sha256=MFGDVjTrddLeeAWmUarWSSP1LiQBOJGPNaSGLn994V4,9418
+pywebexec/static/js/script.js,sha256=J0kOMT5eZx-3YdZ4UGKJLYZ6CjtLzHUXm3laV1e1tUw,18496
 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
@@ -33,11 +33,11 @@ pywebexec/static/js/xterm/addon-unicode11.js.map,sha256=paDj5KKtTIUGedQn2x7CaUTD
 pywebexec/static/js/xterm/xterm.js,sha256=H5kaw7Syg-v5bmCuI6AKUnZd06Lkb6b92p8aqwMvdJU,289441
 pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCfN0U_OI6Zw,1118392
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=2fEN8cggHBEd8-RamDFpnekVJtIbRembFSw0-1YEptc,2979
-pywebexec/templates/popup.html,sha256=GT2jY7oOxpCaBaRl924QJWdFBmfSOP952T13d37R_pY,1506
-pywebexec-1.7.5.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.5.dist-info/METADATA,sha256=ueE1L7xvCOkQEjAF480gyouw1IiRKk0tVOUahe1dxU4,8122
-pywebexec-1.7.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.5.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.5.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.5.dist-info/RECORD,,
+pywebexec/templates/index.html,sha256=CcLN3v_42lnj4juiTntDTiGHJ8-zQnmB9oqpSK_0kks,2981
+pywebexec/templates/popup.html,sha256=f5m4u8WKpkevL2mQamGqo4_y-rSuLOXGuNsezuUbniY,1508
+pywebexec-1.7.8.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.7.8.dist-info/METADATA,sha256=K-4wEuwRvadD43jgSHJmQYSsJoRJUuU1zD-4STQgxbc,8148
+pywebexec-1.7.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.7.8.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.7.8.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.7.8.dist-info/RECORD,,