pywebexec 1.1.2__tar.gz → 1.1.13__tar.gz

{pywebexec-1.1.2/pywebexec.egg-info → pywebexec-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.2
+Version: 1.1.13
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -30,7 +30,7 @@ License: MIT License
 Project-URL: Homepage, https://github.com/joknarf/pywebexec
 Project-URL: Documentation, https://github.com/joknarf/pywebexec/blob/main/README.md
 Project-URL: Repository, https://github.com/joknarf/pywebexec.git
-Keywords: http,fileserver,browser,explorer
+Keywords: http,server,remote commands,api,website
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
@@ -63,7 +63,7 @@ Requires-Dist: ldap3>=2.9.1
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![example](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
-[![](https://pepy.tech/badge/pywebexec)](https://pepy.tech/project/pywebexec)
+[![PyPI Downloads](https://static.pepy.tech/badge/pywebexec)](https://pepy.tech/projects/pywebexec)
 [![Python versions](https://img.shields.io/badge/python-3.6+-blue.svg)](https://shields.io/)
 
 # pywebexec
@@ -83,7 +83,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexec](https://github.com/user-attachments/assets/d352cc23-1552-4b79-a6ff-f02f05cf328e)
+![pywebexecnew](https://github.com/user-attachments/assets/06290b5e-284e-4e41-b32a-0f5aad074658)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 
@@ -99,8 +99,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -122,7 +122,7 @@ Generated password is given if no `--pasword` option
 $ export PYWEBEXEC_LDAP_SERVER=ldap://ldap.forumsys.com:389
 $ export PYWEBEXEC_LDAP_BIND_DN="cn=read-only-admin,dc=example,dc=com"
 $ export PYWEBEXEC_LDAP_BIND_PASSWORD="password"
-$ export PYWEBEXEC_LDAP_GROUPS=ou=mathematicians,ou=scientists
+$ export PYWEBEXEC_LDAP_GROUPS="ou=mathematicians,ou=scientists"
 $ export PYWEBEXEC_LDAP_USER_ID="uid"
 $ export PYWEBEXEC_LDAP_BASE_DN="dc=example,dc=com"
 $ pywebexec
@@ -148,12 +148,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference

{pywebexec-1.1.2 → pywebexec-1.1.13}/README.md

@@ -1,7 +1,7 @@
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![example](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
-[![](https://pepy.tech/badge/pywebexec)](https://pepy.tech/project/pywebexec)
+[![PyPI Downloads](https://static.pepy.tech/badge/pywebexec)](https://pepy.tech/projects/pywebexec)
 [![Python versions](https://img.shields.io/badge/python-3.6+-blue.svg)](https://shields.io/)
 
 # pywebexec
@@ -21,7 +21,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexec](https://github.com/user-attachments/assets/d352cc23-1552-4b79-a6ff-f02f05cf328e)
+![pywebexecnew](https://github.com/user-attachments/assets/06290b5e-284e-4e41-b32a-0f5aad074658)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 
@@ -37,8 +37,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -60,7 +60,7 @@ Generated password is given if no `--pasword` option
 $ export PYWEBEXEC_LDAP_SERVER=ldap://ldap.forumsys.com:389
 $ export PYWEBEXEC_LDAP_BIND_DN="cn=read-only-admin,dc=example,dc=com"
 $ export PYWEBEXEC_LDAP_BIND_PASSWORD="password"
-$ export PYWEBEXEC_LDAP_GROUPS=ou=mathematicians,ou=scientists
+$ export PYWEBEXEC_LDAP_GROUPS="ou=mathematicians,ou=scientists"
 $ export PYWEBEXEC_LDAP_USER_ID="uid"
 $ export PYWEBEXEC_LDAP_BASE_DN="dc=example,dc=com"
 $ pywebexec
@@ -86,12 +86,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference

{pywebexec-1.1.2 → pywebexec-1.1.13}/pyproject.toml

@@ -20,7 +20,7 @@ dynamic=["version"]
 readme = "README.md"
 license = {file = "LICENSE"}
 requires-python = ">= 3.6"
-keywords = ["http", "fileserver", "browser", "explorer"]
+keywords = ["http", "server", "remote commands", "api", "website"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: System Administrators",

{pywebexec-1.1.2 → pywebexec-1.1.13}/pywebexec/pywebexec.py

@@ -342,7 +342,10 @@ def read_command_status(command_id):
     if not os.path.exists(status_file_path):
         return None
     with open(status_file_path, 'r') as f:
-        status_data = json.load(f)
+        try:
+            status_data = json.load(f)
+        except json.JSONDecodeError:
+            return None
     
     # Cache the status if it is not "running"
     if status_data['status'] != 'running':
@@ -382,6 +385,8 @@ def run_command(command, params, command_id):
 
 @app.before_request
 def check_authentication():
+    if not app.config['USER'] and not app.config['LDAP_SERVER']:
+        return
     if 'username' not in session and request.endpoint not in ['login', 'static']:
         return auth.login_required(lambda: None)()
 
@@ -518,7 +523,7 @@ def list_commands():
                     params = shlex.join(status['params'])
                 except AttributeError:
                     params = " ".join([shlex.quote(p) if " " in p else p for p in status['params']])
-                command = status['command'] + ' ' + params
+                command = status.get('command', '-') + ' ' + params
                 commands.append({
                     'command_id': command_id,
                     'status': status['status'],
@@ -539,6 +544,8 @@ def get_command_output(command_id):
         with open(output_file_path, 'r') as output_file:
             output = output_file.read()
         status_data = read_command_status(command_id) or {}
+        if request.headers.get('Accept') == 'text/plain':
+            return f"{output}\nstatus: {status_data.get('status')}", 200, {'Content-Type': 'text/plain'}
         return jsonify({'output': output, 'status': status_data.get("status")})
     return jsonify({'error': 'Invalid command_id'}), 404
 

{pywebexec-1.1.2 → pywebexec-1.1.13}/pywebexec/static/css/style.css

@@ -1,23 +1,46 @@
-body { font-family: Arial, sans-serif; }
-.table-container { height: 270px; overflow-y: auto; position: relative; }
-table { width: 100%; border-collapse: collapse; }
+body {
+    font-family: Arial, sans-serif; 
+}
+.table-container {
+    height: 270px;
+    overflow-y: auto;
+    position: relative;
+    border-radius: 10px;
+    border: 1px solid #aaa;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.30);
+}
+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; }
+th { 
+    background-color: #444;
+    color: #eee;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+}
 .outcol {
     width: 100%;
 }
+select { /* Safari bug */
+    font-size: 15px;
+    border: #aaa solid 1px;
+    border-radius: 5px;
+}
 .output {
     white-space: pre-wrap;
     background: #f0f0f0;
     padding: 10px;
     border: 1px solid #ccc;
     font-family: monospace;
-    border-radius: 15px;
+    border-radius: 10px;
     overflow-y: auto;
 }
 .copy-icon { cursor: pointer; }
@@ -28,7 +51,6 @@ button {
     -webkit-border-radius: none;
     appearance: none;
     border-radius: 15px;
-    padding: 3px;
     padding-right: 13px;
     border: 1px #555 solid;
     height: 22px;
@@ -49,8 +71,13 @@ form {
     background-repeat: no-repeat;
     vertical-align: middle;
 }
+.title-icon {
+    width: 30px;
+    height: 30px;
+    background-image: url("/static/images/favicon.svg")
+}
 .status-running { 
-    background-image: url("/static/images/running.svg")
+    background-image: url("/static/images/running.gif")
 }
 .status-success { 
     background-image: url("/static/images/success.svg")
@@ -62,10 +89,10 @@ form {
     background-image: url("/static/images/aborted.svg")
 }
 .copy_clip {
-    padding-right: 25px;
+    padding-right: 20px;
     background-repeat: no-repeat;
     background-position: right top;
-    background-size: 25px 16px;
+    background-size: 20px 12px;
     white-space: nowrap;
 }
 .copy_clip:hover {
@@ -87,7 +114,7 @@ input {
     height: 15px;
     font-size: 15px;
     outline: none;
-    text-indent: 10px;
+    text-indent: 5px;
     background-color: white;
 }
 .currentcommand {
@@ -96,6 +123,7 @@ input {
 .resizer {
     width: 100%;
     height: 5px;
+    border-radius: 5px;
     background: #aaa;
     cursor: ns-resize;
     position: absolute;
@@ -105,8 +133,35 @@ input {
 .resizer-container {
     position: relative;
     height: 5px;
-    margin-bottom: 10px;
+    margin: 5px;
+    /*margin-bottom: 10px;*/
 }
 tr.clickable-row {
     cursor: pointer;
 }
+body.dimmed {
+    background-color: rgba(0, 0, 0, 0.5);
+    pointer-events: none;
+}
+body.dimmed * {
+    pointer-events: none;
+}
+.dimmer {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 1000;
+}
+.dimmer-text {
+    color: white;
+    font-size: 24px;
+    text-align: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}

pywebexec-1.1.13/pywebexec/static/js/script.js

@@ -0,0 +1,256 @@
+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(' ');
+    try {
+        const response = await fetch('/run_command', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ command: commandName, params: params })
+        });
+        if (!response.ok) {
+            throw new Error('Failed to launch command');
+        }
+        const data = await response.json();
+        fetchCommands();
+        viewOutput(data.command_id);
+    } catch (error) {
+        console.log('Error running command:', error);
+    }
+});
+
+async function fetchCommands() {
+    try {
+        const response = await fetch('/commands');
+        if (!response.ok) {
+            document.getElementById('dimmer').style.display = 'block';
+            return;
+        }
+        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">
+                    ${navigator.clipboard == undefined ? `${command.command_id}` : `<span class="copy_clip" onclick="copyToClipboard('${command.command_id.slice(0, 8)}', this, event)">${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>
+                    ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : `<button onclick="relaunchCommand('${command.command_id}')">Run</button>`}
+                </td>
+                <td class="monospace outcol">${command.last_output_line || ''}</td>
+            `;
+            commandsTbody.appendChild(commandRow);
+        });
+        document.getElementById('dimmer').style.display = 'none';
+    } catch (error) {
+        console.log('Error fetching commands:', error);
+        document.getElementById('dimmer').style.display = 'block';
+    }
+}
+
+async function fetchExecutables() {
+    try {
+        const response = await fetch('/executables');
+        if (!response.ok) {
+            throw new Error('Failed to fetch command status');
+        }
+        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);
+        });
+    } catch (error) {
+        console.log('Error fetching executables:', error);
+        alert("Failed to fetch executables");
+    }
+}
+
+async function fetchOutput(command_id) {
+    try {
+        const outputDiv = document.getElementById('output');
+        const response = await fetch(`/command_output/${command_id}`);
+        if (!response.ok) {
+            return;
+        }
+        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);
+            }
+        }
+    } catch (error) {
+        console.log('Error fetching output:', error);
+    }
+}
+
+async function viewOutput(command_id) {
+    adjustOutputHeight();
+    currentCommandId = command_id;
+    clearInterval(outputInterval);
+    try {
+        const response = await fetch(`/command_status/${command_id}`);
+        if (!response.ok) {
+            return;
+        }
+        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
+    } catch (error) {
+        console.log('Error viewing output:', error);
+    }
+}
+
+async function relaunchCommand(command_id) {
+    try {
+        const response = await fetch(`/command_status/${command_id}`);
+        if (!response.ok) {
+            throw new Error('Failed to fetch command status');
+        }
+        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
+            })
+        });
+        if (!relaunchResponse.ok) {
+            throw new Error('Failed to relaunch command');
+        }
+        const relaunchData = await relaunchResponse.json();
+        fetchCommands();
+        viewOutput(relaunchData.command_id);
+    } catch (error) {
+        console.log('Error relaunching command:', error);
+        alert('Failed to relaunch command. Please try again.');
+    }
+}
+
+async function stopCommand(command_id) {
+    try {
+        const response = await fetch(`/stop_command/${command_id}`, {
+            method: 'POST'
+        });
+        if (!response.ok) {
+            throw new Error('Failed to stop command');
+        }
+        const data = await response.json();
+        if (data.error) {
+            alert(data.error);
+        } else {
+            alert(data.message);
+            fetchCommands();
+        }
+    } catch (error) {
+        console.log('Error stopping command:', error);
+        alert('Failed to stop command. Please try again.');
+    }
+}
+
+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, event) {
+    event.stopPropagation();
+    event.stopImmediatePropagation();
+    navigator.clipboard.writeText(text).then(() => {
+        element.classList.add('copy_clip_ok');
+        setTimeout(() => {
+            element.classList.remove('copy_clip_ok');
+        }, 1000);
+    });
+}
+
+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-1.1.2 → pywebexec-1.1.13}/pywebexec/templates/index.html

@@ -7,7 +7,10 @@
     <link rel="stylesheet" href="/static/css/style.css">
 </head>
 <body>
-    <h2>{{ title }}</h2>
+    <div id="dimmer" class="dimmer">
+        <div class="dimmer-text">Server not reachable</div>
+    </div>
+    <h2><span class="status-icon title-icon"></span>{{ title }}</h2>
     <form id="launchForm">
         <label for="commandName">Command</label>
         <select id="commandName" name="commandName"></select>

{pywebexec-1.1.2 → pywebexec-1.1.13}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.2'
-__version_tuple__ = version_tuple = (1, 1, 2)
+__version__ = version = '1.1.13'
+__version_tuple__ = version_tuple = (1, 1, 13)

{pywebexec-1.1.2 → pywebexec-1.1.13/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.1.2
+Version: 1.1.13
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -30,7 +30,7 @@ License: MIT License
 Project-URL: Homepage, https://github.com/joknarf/pywebexec
 Project-URL: Documentation, https://github.com/joknarf/pywebexec/blob/main/README.md
 Project-URL: Repository, https://github.com/joknarf/pywebexec.git
-Keywords: http,fileserver,browser,explorer
+Keywords: http,server,remote commands,api,website
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
@@ -63,7 +63,7 @@ Requires-Dist: ldap3>=2.9.1
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![example](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
-[![](https://pepy.tech/badge/pywebexec)](https://pepy.tech/project/pywebexec)
+[![PyPI Downloads](https://static.pepy.tech/badge/pywebexec)](https://pepy.tech/projects/pywebexec)
 [![Python versions](https://img.shields.io/badge/python-3.6+-blue.svg)](https://shields.io/)
 
 # pywebexec
@@ -83,7 +83,7 @@ $ pywebexec
 ```
 
 * Launch commands with params/view live output/Status using browser
-![pywebexec](https://github.com/user-attachments/assets/d352cc23-1552-4b79-a6ff-f02f05cf328e)
+![pywebexecnew](https://github.com/user-attachments/assets/06290b5e-284e-4e41-b32a-0f5aad074658)
 
 all commands output / statuses are available in the executables directory in subdirectory `.web_status`
 
@@ -99,8 +99,8 @@ all commands output / statuses are available in the executables directory in sub
 * Basic Auth
 * LDAP(S)
 * Can be started as a daemon (POSIX)
-* uses gunicorn to serve http/https
-* compatible Linux/MacOS
+* Uses gunicorn to serve http/https
+* Linux/MacOS compatible
 
 ## Customize server
 ```shell
@@ -122,7 +122,7 @@ Generated password is given if no `--pasword` option
 $ export PYWEBEXEC_LDAP_SERVER=ldap://ldap.forumsys.com:389
 $ export PYWEBEXEC_LDAP_BIND_DN="cn=read-only-admin,dc=example,dc=com"
 $ export PYWEBEXEC_LDAP_BIND_PASSWORD="password"
-$ export PYWEBEXEC_LDAP_GROUPS=ou=mathematicians,ou=scientists
+$ export PYWEBEXEC_LDAP_GROUPS="ou=mathematicians,ou=scientists"
 $ export PYWEBEXEC_LDAP_USER_ID="uid"
 $ export PYWEBEXEC_LDAP_BASE_DN="dc=example,dc=com"
 $ pywebexec
@@ -148,12 +148,14 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
+* log of server are stored in directory `~/[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 
 ## Launch command through API
 
 ```shell
-$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "param":["param1", ...]}
+$ curl http://myhost:8080/run_script -H 'Content-Type: application/json' -X POST -d '{ "script_name":"myscript", "params":["param1", ...]}
+$ curl http://myhost:8080/command_status/<command_id>
+$ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 ```
 
 ## API reference

{pywebexec-1.1.2 → pywebexec-1.1.13}/pywebexec.egg-info/SOURCES.txt

@@ -19,7 +19,7 @@ pywebexec/static/images/copy.svg
 pywebexec/static/images/copy_ok.svg
 pywebexec/static/images/failed.svg
 pywebexec/static/images/favicon.svg
-pywebexec/static/images/running.svg
+pywebexec/static/images/running.gif
 pywebexec/static/images/success.svg
 pywebexec/static/js/script.js
 pywebexec/templates/__init__.py

pywebexec-1.1.2/pywebexec/static/images/running.svg

@@ -1 +0,0 @@
-<svg viewBox="0 0 1024 1024" class="icon" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#000000"><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="M661.333333 170.666667l253.866667 34.133333-209.066667 209.066667zM362.666667 853.333333L108.8 819.2l209.066667-209.066667zM170.666667 362.666667L204.8 108.8l209.066667 209.066667z" fill="#4949d1"></path><path d="M198.4 452.266667l-89.6 17.066666c-2.133333 14.933333-2.133333 27.733333-2.133333 42.666667 0 98.133333 34.133333 192 98.133333 264.533333l64-55.466666C219.733333 663.466667 192 588.8 192 512c0-19.2 2.133333-40.533333 6.4-59.733333zM512 106.666667c-115.2 0-217.6 49.066667-292.266667 125.866666l59.733334 59.733334C339.2 230.4 420.266667 192 512 192c19.2 0 40.533333 2.133333 59.733333 6.4l14.933334-83.2C563.2 108.8 537.6 106.666667 512 106.666667zM825.6 571.733333l89.6-17.066666c2.133333-14.933333 2.133333-27.733333 2.133333-42.666667 0-93.866667-32-185.6-91.733333-258.133333l-66.133333 53.333333c46.933333 57.6 72.533333 130.133333 72.533333 202.666667 0 21.333333-2.133333 42.666667-6.4 61.866666zM744.533333 731.733333C684.8 793.6 603.733333 832 512 832c-19.2 0-40.533333-2.133333-59.733333-6.4l-14.933334 83.2c25.6 4.266667 51.2 6.4 74.666667 6.4 115.2 0 217.6-49.066667 292.266667-125.866667l-59.733334-57.6z" fill="#4949d1"></path><path d="M853.333333 661.333333l-34.133333 253.866667-209.066667-209.066667z" fill="#4949d1"></path></g></svg>

pywebexec-1.1.2/pywebexec/static/js/script.js

@@ -1,197 +0,0 @@
-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>
-                ${command.status === 'running' ? `<button onclick="stopCommand('${command.command_id}')">Stop</button>` : `                <button onclick="relaunchCommand('${command.command_id}')">Run</button>
-`}
-            </td>
-            <td class="monospace outcol">${command.last_output_line || ''}</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);