pywebexec 1.4.6__py3-none-any.whl → 1.4.8__py3-none-any.whl

pywebexec/pywebexec.py

@@ -682,6 +682,10 @@ def list_executables():
     executables.sort()  # Sort the list of executables alphabetically
     return jsonify(executables)
 
+@app.route('/popup/<command_id>')
+def popup(command_id):
+    return render_template('popup.html', command_id=command_id)
+
 def main():
     basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"
     if args.action == "start":

pywebexec/static/css/style.css

@@ -266,4 +266,16 @@ span {
 #outputSlider {
     width: 100%;
 }
+.popup-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    margin-left: 5px;
+    vertical-align: middle;
+}
+.popup-button img {
+    width: 16px;
+    height: 16px;
+}
 

pywebexec/static/images/popup.svg

@@ -0,0 +1 @@
+<svg fill="#000000" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <title>popout</title> <path d="M15.694 13.541l2.666 2.665 5.016-5.017 2.59 2.59 0.004-7.734-7.785-0.046 2.526 2.525-5.017 5.017zM25.926 16.945l-1.92-1.947 0.035 9.007-16.015 0.009 0.016-15.973 8.958-0.040-2-2h-7c-1.104 0-2 0.896-2 2v16c0 1.104 0.896 2 2 2h16c1.104 0 2-0.896 2-2l-0.074-7.056z"></path> </g></svg>

pywebexec/static/js/popup.js

@@ -0,0 +1,133 @@
+let terminal = new Terminal({
+    cursorBlink: false,
+    cursorInactiveStyle: 'none',
+    disableStdin: true,
+    convertEol: true,
+    fontFamily: 'Consolas NF, monospace, courier-new, courier',
+    scrollback: 999999,
+    theme: {
+        background: '#111412',
+        black: '#111412',
+        green: '#088a5b',
+        blue: "#2760aa",
+        red: '#ba1611',
+        yellow: "#cf8700",
+        magenta: "#4c3d80",
+        cyan: "#00a7aa",
+        brightBlack: "#243C4F",
+        brightBlue: "#5584b1",
+    },
+    customGlyphs: false,
+    rescaleOverlappingGlyphs: true,
+});
+
+const fitAddon = new FitAddon.FitAddon();
+terminal.loadAddon(fitAddon);
+terminal.open(document.getElementById('output'));
+fitAddon.fit();
+
+let currentCommandId = null;
+let outputInterval = null;
+let nextOutputLink = null;
+let fullOutput = '';
+let outputLength = 0;
+let title = null;
+
+function getTokenParam() {
+    const urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get('token') ? `?token=${urlParams.get('token')}` : '';
+}
+const urlToken = getTokenParam();
+
+async function fetchOutput(url) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            return;
+        }
+        const data = await response.json();
+        if (data.error) {
+            terminal.write(data.error);
+            clearInterval(outputInterval);
+        } else {
+            slider = document.getElementById('outputSlider')
+            percentage = slider.value;
+            fullOutput += data.output;
+            if (percentage == 100)
+                terminal.write(data.output);
+            else {
+                percentage = Math.round((outputLength * 100)/fullOutput.length);
+                slider.value = percentage;
+                document.getElementById('outputPercentage').innerText = `${percentage}%`;
+            }
+            nextOutputLink = data.links.next;
+            if (data.status != 'running') {
+                title.innerText = `${data.status} ${title.innerText.split(' ').slice(1).join(' ')}`;
+                clearInterval(outputInterval);
+            }
+        }
+    } catch (error) {
+        console.log('Error fetching output:', error);
+    }
+}
+
+async function viewOutput(command_id) {
+    document.getElementById('outputSlider').value = 100;
+    adjustOutputHeight();
+    currentCommandId = command_id;
+    nextOutputLink = `/command_output/${command_id}${urlToken}`;
+    clearInterval(outputInterval);
+    terminal.clear();
+    terminal.reset();
+    fullOutput = '';
+    try {
+        const response = await fetch(`/command_status/${command_id}${urlToken}`);
+        if (!response.ok) {
+            return;
+        }
+        const data = await response.json();
+        title.innerText = `${data.status} ${data.command} ${data.params.join(' ')}`;
+        if (data.command == 'term')
+            terminal.options.cursorInactiveStyle = 'outline';
+        else
+            terminal.options.cursorInactiveStyle = 'none';
+        if (data.status === 'running') {
+            fetchOutput(nextOutputLink);
+            outputInterval = setInterval(() => fetchOutput(nextOutputLink), 1000);
+        } else {
+            fetchOutput(nextOutputLink);
+        }
+    } catch (error) {
+        console.log('Error viewing output:', error);
+    }
+}
+
+function adjustOutputHeight() {
+    const outputDiv = document.getElementById('output');
+    const windowHeight = window.innerHeight;
+    const outputTop = outputDiv.getBoundingClientRect().top;
+    const maxHeight = windowHeight - outputTop - 60; // Adjusted for slider height
+    outputDiv.style.height = `${maxHeight}px`;
+    fitAddon.fit();
+}
+
+function sliderUpdateOutput() {
+    const slider = document.getElementById('outputSlider');
+    const percentage = slider.value;
+    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('outputSlider').addEventListener('input', sliderUpdateOutput);
+
+window.addEventListener('resize', adjustOutputHeight);
+window.addEventListener('load', () => {
+    title = document.getElementById('outputTitle');
+    const commandId = window.location.pathname.split('/').slice(-1)[0];
+    viewOutput(commandId);
+});
+

pywebexec/static/js/script.js

@@ -107,7 +107,12 @@ async function fetchCommands() {
                 <td>
                     ${command.command.startsWith('term') ? '' : command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
                 </td>
-                <td class="monospace outcol">${command.last_output_line || ''}</td>
+                <td class="monospace outcol">
+                    <button class="popup-button" onclick="openPopup('${command.command_id}', event)">
+                        <img src="/static/images/popup.svg" alt="Popup">
+                    </button>
+                    ${command.last_output_line || ''}
+                </td>
             `;
             commandsTbody.appendChild(commandRow);
         });
@@ -180,6 +185,11 @@ async function viewOutput(command_id) {
     }
 }
 
+async function openPopup(command_id) {
+    const popupUrl = `/popup/${command_id}${urlToken}`;
+    window.open(popupUrl, '_blank', 'width=1000,height=600');
+}
+
 async function relaunchCommand(command_id, event) {
     event.stopPropagation();
     event.stopImmediatePropagation();

pywebexec/templates/popup.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/static/images/favicon.svg" type="image/svg+xml">
+    <title id="outputTitle">Command Output</title>
+    <link rel="stylesheet" href="/static/css/style.css">
+    <link rel="stylesheet" href="/static/css/xterm.css">
+</head>
+<body>
+    <div id="output" class="output"></div>
+    <div class="slider-container">
+        <input type="range" id="outputSlider" min="0" max="100" value="100">
+        <label for="outputSlider"><span id="outputPercentage">100%</span></label>
+    </div>
+    <script src="/static/js/xterm/ansi_up.min.js"></script>
+    <script src="/static/js/xterm/xterm.js"></script>
+    <script src="/static/js/xterm/xterm-addon-fit.js"></script>
+    <script type="text/javascript" src="/static/js/popup.js"></script>
+</body>
+</html>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.6'
-__version_tuple__ = version_tuple = (1, 4, 6)
+__version__ = version = '1.4.8'
+__version_tuple__ = version_tuple = (1, 4, 8)

{pywebexec-1.4.6.dist-info → pywebexec-1.4.8.dist-info}/METADATA

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

{pywebexec-1.4.6.dist-info → pywebexec-1.4.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
-pywebexec/pywebexec.py,sha256=w5XUxh9rJqbVO4Um9fJb4DcBd-VoOGc6cNXBjPVPkm8,26003
-pywebexec/version.py,sha256=HFQuEZSl62eJNTO3Swl0voif7bfUlhX7pVxUC5X9W7g,411
+pywebexec/pywebexec.py,sha256=wediupUiLmpCaER3b_-07QitIiTimgmEBBxFLGT6-DQ,26125
+pywebexec/version.py,sha256=5V0g1zXAYqZG41mH-4FajHcVE05C9vUQm3ybra2NhKU,411
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=b02WQoXwVm00JpedEslvCHjr35txo2Bfjz3Iboco9U8,5500
+pywebexec/static/css/style.css,sha256=sDBhZ-csW5THIKfTDsHqxCSg6rIJ91Oh15sjw_HjJo4,5702
 pywebexec/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
 pywebexec/static/images/aborted.svg,sha256=_mP43hU5QdRLFZIknBgjx-dIXrHgQG23-QV27ApXK2A,381
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -10,19 +10,22 @@ pywebexec/static/images/copy_ok.svg,sha256=mEqUVUhSq8xaJK2msQkxRawnz_KwlCZ-tok8Q
 pywebexec/static/images/down-arrow.svg,sha256=4TclEmntMvKk_F_ADXgTpGtviYo826EDmmZiGE7HQBI,121
 pywebexec/static/images/failed.svg,sha256=ADZ7IKrUyOXtqpivnz3VcH0-Wru-I5MOi3OJAkI3hxk,1439
 pywebexec/static/images/favicon.svg,sha256=9gSN5Oak1zTWhTCyutlupPBKUxcbdoVt7dvhk8xvEug,1224
+pywebexec/static/images/popup.svg,sha256=0Bl9A_v5cBsMPn6FnOlVWlAQKgd2zqiWQbhjcL9BDzI,559
 pywebexec/static/images/running.gif,sha256=iYuzQGkMxrakSIwt6gPieKCImGZoSAHmU5MUNZa7cpw,25696
 pywebexec/static/images/success.svg,sha256=PJDcCSTevJh7rkfSFLtc7P0pbeh8PVQBS8DaOLQemmc,489
 pywebexec/static/js/commands.js,sha256=8JDb3Q55EJOYf2Q9Uy6qEuqAnn1oGjM0RndgQ4aOjqo,7725
-pywebexec/static/js/script.js,sha256=_Z1P65x-s_heHMwXbVpPHJHqfQKcIZavVhRej6i3DIs,11570
+pywebexec/static/js/popup.js,sha256=n5JaFwuoiBkYQJGOIva__qVY7eQBNQ9vHEr0lIKHTY4,4399
+pywebexec/static/js/script.js,sha256=B7_rpQiiwgKpqtAprZx0RcSYjwPvd4SRbvgyF9dNzP0,11973
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/ansi_up.min.js,sha256=KNGV0vEr30hNqKQimTAvGVy-icD5A1JqMQTtvYtKR2Y,13203
 pywebexec/static/js/xterm/xterm-addon-fit.js,sha256=Pprm9pZe4SadVXS5Bc8b9VnC9Ex4QlWwA0pxOH53Gck,1460
 pywebexec/static/js/xterm/xterm.js,sha256=Bzka76jZwEhVt_LlS0e0qMw7ryGa1p5qfxFyeohphBo,283371
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pywebexec/templates/index.html,sha256=DYtT555wSNhnFtzzHhPMWJireynCJNnAuTytpoORQeE,2321
-pywebexec-1.4.6.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.4.6.dist-info/METADATA,sha256=qEVPHe_lSiRjwa3YnaLm7ycdCjpUtdOrDL3v1WRxsS0,7399
-pywebexec-1.4.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.4.6.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.4.6.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.4.6.dist-info/RECORD,,
+pywebexec/templates/popup.html,sha256=6kmZKb0tGJ7jsr9DqDEriSMlbkW-PJTtCiUE9U5_FOE,837
+pywebexec-1.4.8.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.4.8.dist-info/METADATA,sha256=1yv4C31GoevftBY7JMF3wp14lHRZmkCg4PVZoXjjgx8,7399
+pywebexec-1.4.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.4.8.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.4.8.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.4.8.dist-info/RECORD,,