pywebexec 0.1.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

pywebexec/static/css/style.css

@@ -0,0 +1,112 @@
+body { font-family: Arial, sans-serif; }
+.table-container { height: 270px; overflow-y: auto; position: relative; }
+table { width: 100%; border-collapse: collapse; }
+th, td {
+    padding: 8px;
+    text-align: left;
+    border-bottom: 1px solid #ddd;
+    white-space: nowrap;
+}
+th { background-color: #f2f2f2; position: sticky; top: 0; z-index: 1; }
+.outcol {
+    width: 100%;
+}
+.output {
+    white-space: pre-wrap;
+    background: #f0f0f0;
+    padding: 10px;
+    border: 1px solid #ccc;
+    font-family: monospace;
+    border-radius: 15px;
+    overflow-y: auto;
+}
+.copy-icon { cursor: pointer; }
+.monospace { font-family: monospace; }
+.copied { color: green; margin-left: 5px; }
+button {
+    -webkit-appearance: none;
+    -webkit-border-radius: none;
+    appearance: none;
+    border-radius: 15px;
+    padding: 3px;
+    padding-right: 13px;
+    border: 1px #555 solid;
+    height: 22px;
+    font-size: 13px;
+    outline: none;
+    text-indent: 10px;
+    background-color: #eee;
+}
+form {
+    padding-bottom: 15px;
+}
+.status-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    margin-right: 5px;
+    background-size: contain;
+    background-repeat: no-repeat;
+    vertical-align: middle;
+}
+.status-running { 
+    background-image: url("/static/images/running.svg")
+}
+.status-success { 
+    background-image: url("/static/images/success.svg")
+}
+.status-failed { 
+    background-image: url("/static/images/failed.svg")
+}
+.status-aborted { 
+    background-image: url("/static/images/aborted.svg")
+}
+.copy_clip {
+    padding-right: 25px;
+    background-repeat: no-repeat;
+    background-position: right top;
+    background-size: 25px 16px;
+    white-space: nowrap;
+}
+.copy_clip:hover {
+    cursor: pointer;
+    background-image: url("/static/images/copy.svg");
+}
+.copy_clip_ok, .copy_clip_ok:hover {
+    background-image: url("/static/images/copy_ok.svg");
+}
+input {
+    width: 50%;
+    -webkit-appearance: none;
+    -webkit-border-radius: none;
+    appearance: none;
+    border-radius: 15px;
+    padding: 3px;
+    padding-right: 13px;
+    border: 1px #aaa solid;
+    height: 15px;
+    font-size: 15px;
+    outline: none;
+    text-indent: 10px;
+    background-color: white;
+}
+.currentcommand {
+    background-color: #eef;
+}
+.resizer {
+    width: 100%;
+    height: 5px;
+    background: #aaa;
+    cursor: ns-resize;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
+.resizer-container {
+    position: relative;
+    height: 5px;
+    margin-bottom: 10px;
+}
+tr.clickable-row {
+    cursor: pointer;
+}

pywebexec/static/images/favicon.svg

@@ -0,0 +1 @@
+<svg fill="#000000" viewBox="-1 0 19 19" xmlns="http://www.w3.org/2000/svg" class="cf-icon-svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><path d="M16.5 9.5a8 8 0 1 1-8-8 8 8 0 0 1 8 8zm-2.97.006a5.03 5.03 0 1 0-5.03 5.03 5.03 5.03 0 0 0 5.03-5.03zm-7.383-.4H4.289a4.237 4.237 0 0 1 2.565-3.498q.1-.042.2-.079a7.702 7.702 0 0 0-.907 3.577zm0 .8a7.7 7.7 0 0 0 .908 3.577q-.102-.037-.201-.079a4.225 4.225 0 0 1-2.565-3.498zm.8-.8a9.04 9.04 0 0 1 .163-1.402 6.164 6.164 0 0 1 .445-1.415c.289-.615.66-1.013.945-1.013.285 0 .656.398.945 1.013a6.18 6.18 0 0 1 .445 1.415 9.078 9.078 0 0 1 .163 1.402zm3.106.8a9.073 9.073 0 0 1-.163 1.402 6.187 6.187 0 0 1-.445 1.415c-.289.616-.66 1.013-.945 1.013-.285 0-.656-.397-.945-1.013a6.172 6.172 0 0 1-.445-1.415 9.036 9.036 0 0 1-.163-1.402zm1.438-3.391a4.211 4.211 0 0 1 1.22 2.591h-1.858a7.698 7.698 0 0 0-.908-3.577q.102.037.201.08a4.208 4.208 0 0 1 1.345.906zm-.638 3.391h1.858a4.238 4.238 0 0 1-2.565 3.498q-.1.043-.2.08a7.697 7.697 0 0 0 .907-3.578z"></path></g></svg>

pywebexec/static/js/script.js

@@ -0,0 +1,197 @@
+let currentCommandId = null;
+let outputInterval = null;
+
+document.getElementById('launchForm').addEventListener('submit', async (event) => {
+    event.preventDefault();
+    const commandName = document.getElementById('commandName').value;
+    const params = document.getElementById('params').value.split(' ');
+    const response = await fetch('/run_command', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ command: commandName, params: params })
+    });
+    const data = await response.json();
+    fetchCommands();
+    viewOutput(data.command_id);
+});
+
+async function fetchCommands() {
+    const response = await fetch('/commands');
+    const commands = await response.json();
+    commands.sort((a, b) => new Date(b.start_time) - new Date(a.start_time));
+    const commandsTbody = document.getElementById('commands');
+    commandsTbody.innerHTML = '';
+    if (!currentCommandId && commands.length) {
+        currentCommandId = commands[0].command_id;
+        viewOutput(currentCommandId);
+    }
+    commands.forEach(command => {
+        const commandRow = document.createElement('tr');
+        commandRow.className = `clickable-row ${command.command_id === currentCommandId ? 'currentcommand' : ''}`;
+        commandRow.onclick = () => viewOutput(command.command_id);
+        commandRow.innerHTML = `
+            <td class="monospace">
+                <span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this)">${command.command_id.slice(0, 8)}</span>
+            </td>
+            <td><span class="status-icon status-${command.status}"></span>${command.status}</td>
+            <td>${formatTime(command.start_time)}</td>
+            <td>${command.status === 'running' ? formatDuration(command.start_time, new Date().toISOString()) : formatDuration(command.start_time, command.end_time)}</td>
+            <td>${command.exit_code}</td>
+            <td>${command.command.replace(/^\.\//, '')}</td>
+            <td class="monospace outcol">${command.last_output_line || ''}</td>
+            <td>
+                <button onclick="relaunchCommand('${command.command_id}')">Relaunch</button>
+                ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : ''}
+            </td>
+        `;
+        commandsTbody.appendChild(commandRow);
+    });
+}
+
+async function fetchExecutables() {
+    const response = await fetch('/executables');
+    const executables = await response.json();
+    const commandNameSelect = document.getElementById('commandName');
+    commandNameSelect.innerHTML = '';
+    executables.forEach(executable => {
+        const option = document.createElement('option');
+        option.value = executable;
+        option.textContent = executable;
+        commandNameSelect.appendChild(option);
+    });
+}
+
+async function fetchOutput(command_id) {
+    const outputDiv = document.getElementById('output');
+    const response = await fetch(`/command_output/${command_id}`);
+    const data = await response.json();
+    if (data.error) {
+        outputDiv.innerHTML = data.error;
+        clearInterval(outputInterval);
+    } else {
+        outputDiv.innerHTML = data.output;
+        outputDiv.scrollTop = outputDiv.scrollHeight;
+        if (data.status != 'running') {
+            clearInterval(outputInterval);
+        }
+    }
+}
+
+async function viewOutput(command_id) {
+    adjustOutputHeight();
+    currentCommandId = command_id;
+    clearInterval(outputInterval);
+    const response = await fetch(`/command_status/${command_id}`);
+    const data = await response.json();
+    if (data.status === 'running') {
+        fetchOutput(command_id);
+        outputInterval = setInterval(() => fetchOutput(command_id), 1000);
+    } else {
+        fetchOutput(command_id);
+    }
+    fetchCommands(); // Refresh the command list to highlight the current command
+}
+
+async function relaunchCommand(command_id) {
+    const response = await fetch(`/command_status/${command_id}`);
+    const data = await response.json();
+    if (data.error) {
+        alert(data.error);
+        return;
+    }
+    const relaunchResponse = await fetch('/run_command', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+            command: data.command,
+            params: data.params
+        })
+    });
+    const relaunchData = await relaunchResponse.json();
+    fetchCommands();
+    viewOutput(relaunchData.command_id);
+}
+
+async function stopCommand(command_id) {
+    const response = await fetch(`/stop_command/${command_id}`, {
+        method: 'POST'
+    });
+    const data = await response.json();
+    if (data.error) {
+        alert(data.error);
+    } else {
+        alert(data.message);
+        fetchCommands();
+    }
+}
+
+function formatTime(time) {
+    if (!time || time === 'N/A') return 'N/A';
+    const date = new Date(time);
+    return date.toISOString().slice(0, 16).replace('T', ' ');
+}
+
+function formatDuration(startTime, endTime) {
+    if (!startTime || !endTime) return 'N/A';
+    const start = new Date(startTime);
+    const end = new Date(endTime);
+    const duration = (end - start) / 1000;
+    const hours = Math.floor(duration / 3600);
+    const minutes = Math.floor((duration % 3600) / 60);
+    const seconds = Math.floor(duration % 60);
+    return `${hours}h ${minutes}m ${seconds}s`;
+}
+
+function copyToClipboard(text, element) {
+    navigator.clipboard.writeText(text).then(() => {
+        element.classList.add('copy_clip_ok');
+        setTimeout(() => {
+            element.classList.remove('copy_clip_ok');
+        }, 2000);
+    });
+}
+
+function adjustOutputHeight() {
+    const outputDiv = document.getElementById('output');
+    const windowHeight = window.innerHeight;
+    const outputTop = outputDiv.getBoundingClientRect().top;
+    const maxHeight = windowHeight - outputTop - 30; // 20px for padding/margin
+    outputDiv.style.maxHeight = `${maxHeight}px`;
+}
+
+function initResizer() {
+    const resizer = document.getElementById('resizer');
+    const tableContainer = document.getElementById('tableContainer');
+    let startY, startHeight;
+
+    resizer.addEventListener('mousedown', (e) => {
+        startY = e.clientY;
+        startHeight = parseInt(document.defaultView.getComputedStyle(tableContainer).height, 10);
+        document.documentElement.addEventListener('mousemove', doDrag, false);
+        document.documentElement.addEventListener('mouseup', stopDrag, false);
+    });
+
+    function doDrag(e) {
+        tableContainer.style.height = `${startHeight + e.clientY - startY}px`;
+        adjustOutputHeight();
+    }
+
+    function stopDrag() {
+        document.documentElement.removeEventListener('mousemove', doDrag, false);
+        document.documentElement.removeEventListener('mouseup', stopDrag, false);
+    }
+}
+
+window.addEventListener('resize', adjustOutputHeight);
+window.addEventListener('load', () => {
+    adjustOutputHeight();
+    initResizer();
+});
+
+fetchExecutables();
+fetchCommands();
+setInterval(fetchCommands, 5000);

pywebexec/templates/index.html

@@ -2,112 +2,16 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>pywebexec</title>
-    <style>
-        body { font-family: Arial, sans-serif; }
-        .table-container { height: 380px; overflow-y: auto; position: relative; }
-        table { width: 100%; border-collapse: collapse; }
-        th, td { padding: 8px; text-align: left; border-bottom: 1px solid #ddd; }
-        th { background-color: #f2f2f2; position: sticky; top: 0; z-index: 1; }
-        .output {
-            white-space: pre-wrap;
-            background: #f0f0f0;
-            padding: 10px;
-            border: 1px solid #ccc;
-            font-family: monospace;
-            border-radius: 15px;
-            overflow-y: auto;
-        }
-        .copy-icon { cursor: pointer; }
-        .monospace { font-family: monospace; }
-        .copied { color: green; margin-left: 5px; }
-        button {
-            -webkit-appearance: none;
-            -webkit-border-radius: none;
-            appearance: none;
-            border-radius: 15px;
-            padding: 3px;
-            padding-right: 13px;
-            border: 1px #555 solid;
-            height: 22px;
-            font-size: 13px;
-            outline: none;
-            text-indent: 10px;
-            background-color: #eee;
-            display: inline-block;
-            vertical-align: middle;
-        }
-        form {
-            padding-bottom: 15px;
-        }
-        .status-icon {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            margin-right: 5px;
-            background-size: contain;
-            background-repeat: no-repeat;
-            vertical-align: middle;
-        }
-        .status-running { 
-            background-image: url("/static/images/running.svg")
-        }
-        .status-success { 
-            background-image: url("/static/images/success.svg")
-        }
-        .status-failed { 
-            background-image: url("/static/images/failed.svg")
-        }
-        .status-aborted { 
-            background-image: url("/static/images/aborted.svg")
-        }
-        .copy_clip {
-            padding-right: 25px;
-            background-repeat: no-repeat;
-            background-position: right top;
-            background-size: 25px 16px;
-            white-space: nowrap;
-        }
-        .copy_clip_left {
-            padding-left: 25px;
-            padding-right: 0px;
-            background-position: left top;
-        }
-        .copy_clip:hover {
-            cursor: pointer;
-            background-image: url("/static/images/copy.svg");
-        }
-        .copy_clip_ok, .copy_clip_ok:hover {
-            background-image: url("/static/images/copy_ok.svg");
-        }
-        input {
-            width: 50%
-        }
-        .currentscript {
-            background-color: #eef;
-        }
-        .resizer {
-            width: 100%;
-            height: 5px;
-            background: #aaa;
-            cursor: ns-resize;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-        }
-        .resizer-container {
-            position: relative;
-            height: 5px;
-            margin-bottom: 10px;
-        }
-    </style>
+    <link rel="icon" href="/static/images/favicon.svg" type="image/svg+xml">
+    <title>{{ title }}</title>
+    <link rel="stylesheet" href="/static/css/style.css">
 </head>
 <body>
-    <h1>pywebexec</h1>
+    <h2>{{ title }}</h2>
     <form id="launchForm">
-        <label for="scriptName">Command:</label>
-        <select id="scriptName" name="scriptName"></select>
-        <label for="params">Params:</label>
+        <label for="commandName">Command</label>
+        <select id="commandName" name="commandName"></select>
+        <label for="params">Params</label>
         <input type="text" id="params" name="params">
         <button type="submit">Launch</button>
     </form>
@@ -115,216 +19,23 @@
         <table>
             <thead>
                 <tr>
-                    <th>Script ID</th>
+                    <th>ID</th>
                     <th>Status</th>
                     <th>Start Time</th>
                     <th>Duration</th>
                     <th>Exit</th>
                     <th>Command</th>
+                    <th>Output</th>
                     <th>Actions</th>
                 </tr>
             </thead>
-            <tbody id="scripts"></tbody>
+            <tbody id="commands"></tbody>
         </table>
     </div>
     <div class="resizer-container">
         <div class="resizer" id="resizer"></div>
     </div>
     <div id="output" class="output"></div>
-
-    <script>
-        let currentScriptId = null;
-        let outputInterval = null;
-
-        document.getElementById('launchForm').addEventListener('submit', async (event) => {
-            event.preventDefault();
-            const scriptName = document.getElementById('scriptName').value;
-            const params = document.getElementById('params').value.split(' ');
-            const response = await fetch('/run_script', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({ script_name: scriptName, params: params })
-            });
-            const data = await response.json();
-            fetchScripts();
-            viewOutput(data.script_id);
-        });
-
-        async function fetchScripts() {
-            const response = await fetch('/scripts');
-            const scripts = await response.json();
-            scripts.sort((a, b) => new Date(b.start_time) - new Date(a.start_time));
-            const scriptsTbody = document.getElementById('scripts');
-            scriptsTbody.innerHTML = '';
-            scripts.forEach(script => {
-                const scriptRow = document.createElement('tr');
-                scriptRow.className = script.script_id === currentScriptId ? 'currentscript' : '';
-                scriptRow.innerHTML = `
-                    <td class="monospace">
-                        <span class="copy_clip" onclick="copyToClipboard('${script.script_id}', this)">${script.script_id.slice(0, 8)}</span>
-                    </td>
-                    <td><span class="status-icon status-${script.status}"></span>${script.status}</td>
-                    <td>${formatTime(script.start_time)}</td>
-                    <td>${script.status === 'running' ? formatDuration(script.start_time, new Date().toISOString()) : formatDuration(script.start_time, script.end_time)}</td>
-                    <td>${script.exit_code}</td>
-                    <td>${script.command.replace(/^\.\//, '')}</td>
-                    <td>
-                        <button onclick="viewOutput('${script.script_id}')">Log</button>
-                        <button onclick="relaunchScript('${script.script_id}')">Relaunch</button>
-                        ${script.status === 'running' ? `<button onclick="stopScript('${script.script_id}')">Stop</button>` : ''}
-                    </td>
-                `;
-                scriptsTbody.appendChild(scriptRow);
-            });
-        }
-
-        async function fetchExecutables() {
-            const response = await fetch('/executables');
-            const executables = await response.json();
-            const scriptNameSelect = document.getElementById('scriptName');
-            scriptNameSelect.innerHTML = '';
-            executables.forEach(executable => {
-                const option = document.createElement('option');
-                option.value = executable;
-                option.textContent = executable;
-                scriptNameSelect.appendChild(option);
-            });
-        }
-
-        async function fetchOutput(script_id) {
-            const outputDiv = document.getElementById('output');
-            const response = await fetch(`/script_output/${script_id}`);
-            const data = await response.json();
-            if (data.error) {
-                outputDiv.innerHTML = data.error;
-                clearInterval(outputInterval);
-            } else {
-                outputDiv.innerHTML = data.output;
-                outputDiv.scrollTop = outputDiv.scrollHeight;
-                if (data.status != 'running') {
-                    clearInterval(outputInterval);
-                }
-            }
-        }
-
-        async function viewOutput(script_id) {
-            adjustOutputHeight();
-            currentScriptId = script_id;
-            clearInterval(outputInterval);
-            const response = await fetch(`/script_status/${script_id}`);
-            const data = await response.json();
-            if (data.status === 'running') {
-                fetchOutput(script_id);
-                outputInterval = setInterval(() => fetchOutput(script_id), 1000);
-            } else {
-                fetchOutput(script_id);
-            }
-            fetchScripts(); // Refresh the script list to highlight the current script
-        }
-
-        async function relaunchScript(script_id) {
-            const response = await fetch(`/script_status/${script_id}`);
-            const data = await response.json();
-            if (data.error) {
-                alert(data.error);
-                return;
-            }
-            const relaunchResponse = await fetch('/run_script', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    script_name: data.script_name,
-                    params: data.params
-                })
-            });
-            const relaunchData = await relaunchResponse.json();
-            fetchScripts();
-            viewOutput(relaunchData.script_id);
-        }
-
-        async function stopScript(script_id) {
-            const response = await fetch(`/stop_script/${script_id}`, {
-                method: 'POST'
-            });
-            const data = await response.json();
-            if (data.error) {
-                alert(data.error);
-            } else {
-                alert(data.message);
-                fetchScripts();
-            }
-        }
-
-        function formatTime(time) {
-            if (!time || time === 'N/A') return 'N/A';
-            const date = new Date(time);
-            return date.toISOString().slice(0, 16).replace('T', ' ');
-        }
-
-        function formatDuration(startTime, endTime) {
-            if (!startTime || !endTime) return 'N/A';
-            const start = new Date(startTime);
-            const end = new Date(endTime);
-            const duration = (end - start) / 1000;
-            const hours = Math.floor(duration / 3600);
-            const minutes = Math.floor((duration % 3600) / 60);
-            const seconds = Math.floor(duration % 60);
-            return `${hours}h ${minutes}m ${seconds}s`;
-        }
-
-        function copyToClipboard(text, element) {
-            navigator.clipboard.writeText(text).then(() => {
-                element.classList.add('copy_clip_ok');
-                setTimeout(() => {
-                    element.classList.remove('copy_clip_ok');
-                }, 2000);
-            });
-        }
-
-        function adjustOutputHeight() {
-            const outputDiv = document.getElementById('output');
-            const windowHeight = window.innerHeight;
-            const outputTop = outputDiv.getBoundingClientRect().top;
-            const maxHeight = windowHeight - outputTop - 30; // 20px for padding/margin
-            outputDiv.style.maxHeight = `${maxHeight}px`;
-        }
-
-        function initResizer() {
-            const resizer = document.getElementById('resizer');
-            const tableContainer = document.getElementById('tableContainer');
-            let startY, startHeight;
-
-            resizer.addEventListener('mousedown', (e) => {
-                startY = e.clientY;
-                startHeight = parseInt(document.defaultView.getComputedStyle(tableContainer).height, 10);
-                document.documentElement.addEventListener('mousemove', doDrag, false);
-                document.documentElement.addEventListener('mouseup', stopDrag, false);
-            });
-
-            function doDrag(e) {
-                tableContainer.style.height = `${startHeight + e.clientY - startY}px`;
-                adjustOutputHeight();
-            }
-
-            function stopDrag() {
-                document.documentElement.removeEventListener('mousemove', doDrag, false);
-                document.documentElement.removeEventListener('mouseup', stopDrag, false);
-            }
-        }
-
-        window.addEventListener('resize', adjustOutputHeight);
-        window.addEventListener('load', () => {
-            adjustOutputHeight();
-            initResizer();
-        });
-
-        fetchScripts();
-        fetchExecutables();
-        setInterval(fetchScripts, 5000);
-    </script>
+    <script type="text/javascript" src="/static/js/script.js"></script>
 </body>
 </html>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.1'
-__version_tuple__ = version_tuple = (0, 1, 1)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)