pywebexec 0.0.7__tar.gz → 0.0.9__tar.gz

{pywebexec-0.0.7/pywebexec.egg-info → pywebexec-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.7
+Version: 0.0.9
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -53,6 +53,7 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=3.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
@@ -127,5 +128,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.9}/README.md

@@ -68,5 +68,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.9}/pyproject.toml

@@ -9,6 +9,7 @@ maintainers = [
 
 description = "Simple Python HTTP Exec Server"
 dependencies = [
+  "python-daemon>=2.3.2",
   "cryptography>=40.0.2",
   "Flask>=3.0.3",
   "Flask-HTTPAuth>=4.8.0",

{pywebexec-0.0.7 → pywebexec-0.0.9}/pywebexec/pywebexec.py

@@ -1,3 +1,4 @@
+import sys
 from flask import Flask, request, jsonify, render_template
 from flask_httpauth import HTTPBasicAuth
 import subprocess
@@ -10,13 +11,17 @@ import random
 import string
 from datetime import datetime
 import shlex
-from gunicorn.app.base import BaseApplication
+from gunicorn.app.base import BaseApplication, Application
 
 app = Flask(__name__)
 auth = HTTPBasicAuth()
 
 # Directory to store the script status and output
 SCRIPT_STATUS_DIR = '.web_status'
+CONFDIR = os.path.expanduser("~/")
+if os.path.isdir(f"{CONFDIR}/.config"):
+    CONFDIR += '/.config'
+CONFDIR += "/.pywebexec"
 
 if not os.path.exists(SCRIPT_STATUS_DIR):
     os.makedirs(SCRIPT_STATUS_DIR)
@@ -25,7 +30,7 @@ def generate_random_password(length=12):
     characters = string.ascii_letters + string.digits + string.punctuation
     return ''.join(random.choice(characters) for i in range(length))
 
-class StandaloneApplication(BaseApplication):
+class StandaloneApplication(Application):
 
     def __init__(self, app, options=None):
         self.options = options or {}
@@ -44,13 +49,25 @@ class StandaloneApplication(BaseApplication):
         return self.application
 
 
-def start_gunicorn():
+def start_gunicorn(daemon=False, baselog=None):
+    if daemon:
+        errorlog = f"{baselog}.log"
+        accesslog = None # f"{baselog}.access.log"
+        pidfile = f"{baselog}.pid"
+    else:
+        errorlog = "-"
+        accesslog = "-"
+        pidfile = None
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
         'workers': 4,
         'timeout': 600,
         'certfile': args.cert,
         'keyfile': args.key,
+        'daemon': daemon,
+        'errorlog': errorlog,
+        'accesslog': accesslog,
+        'pidfile': pidfile,
     }
     StandaloneApplication(app, options=options).run()
 
@@ -86,7 +103,10 @@ def daemon_d(action, pidfilepath, hostname=None, args=None):
             working_directory=os.getcwd(),
         )
         with daemon_context:
-            start_gunicorn()
+            try:
+                start_gunicorn()
+            except Exception as e:
+                print(e)
 
 def parseargs():
     global app, args
@@ -114,6 +134,15 @@ def parseargs():
     parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status", choices=["start","stop","restart","status"])
 
     args = parser.parse_args()
+    if os.path.isdir(args.dir):
+        try:
+            os.chdir(args.dir)
+        except OSError:
+            print(f"Error: cannot chdir {args.dir}", file=sys.stderr)
+            sys.exit(1)
+    else:
+        print(f"Error: {args.dir} not found", file=sys.stderr)
+        sys.exit(1)
 
     if args.user:
         app.config['USER'] = args.user
@@ -317,10 +346,14 @@ def verify_password(username, password):
     return username == app.config['USER'] and password == app.config['PASSWORD']
 
 def main():
+    basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"
+    if not os.path.exists(CONFDIR):
+        os.mkdir(CONFDIR, mode=0o700)
+    if args.action == "start":
+        return start_gunicorn(daemon=True, baselog=basef)
     if args.action:
-        daemon_d(args.action, pidfilepath=SCRIPT_STATUS_DIR+'/pywebexec')
-    else:
-        start_gunicorn()
+        return daemon_d(args.action, pidfilepath=basef)
+    return start_gunicorn()
 
 if __name__ == '__main__':
     main()

{pywebexec-0.0.7 → pywebexec-0.0.9}/pywebexec/templates/index.html

@@ -5,7 +5,7 @@
     <title>pywebexec</title>
     <style>
         body { font-family: Arial, sans-serif; }
-        .table-container { max-height: 385px; overflow-y: auto; }
+        .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; }
@@ -16,6 +16,7 @@
             border: 1px solid #ccc;
             font-family: monospace;
             border-radius: 15px;
+            overflow-y: auto;
         }
         .copy-icon { cursor: pointer; }
         .monospace { font-family: monospace; }
@@ -85,6 +86,20 @@
         .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>
 </head>
 <body>
@@ -96,7 +111,7 @@
         <input type="text" id="params" name="params">
         <button type="submit">Launch</button>
     </form>
-    <div class="table-container">
+    <div class="table-container" id="tableContainer">
         <table>
             <thead>
                 <tr>
@@ -112,6 +127,9 @@
             <tbody id="scripts"></tbody>
         </table>
     </div>
+    <div class="resizer-container">
+        <div class="resizer" id="resizer"></div>
+    </div>
     <div id="output" class="output"></div>
 
     <script>
@@ -131,7 +149,7 @@
             });
             const data = await response.json();
             fetchScripts();
-            viewOutput(data.script_id)
+            viewOutput(data.script_id);
         });
 
         async function fetchScripts() {
@@ -184,13 +202,15 @@
                 clearInterval(outputInterval);
             } else {
                 outputDiv.innerHTML = data.output;
+                outputDiv.scrollTop = outputDiv.scrollHeight;
                 if (data.status != 'running') {
-                    clearInterval(outputInterval)
+                    clearInterval(outputInterval);
                 }
             }
         }
 
         async function viewOutput(script_id) {
+            adjustOutputHeight();
             currentScriptId = script_id;
             clearInterval(outputInterval);
             const response = await fetch(`/script_status/${script_id}`);
@@ -223,7 +243,7 @@
             });
             const relaunchData = await relaunchResponse.json();
             fetchScripts();
-            viewOutput(relaunchData.script_id)
+            viewOutput(relaunchData.script_id);
         }
 
         async function stopScript(script_id) {
@@ -258,13 +278,50 @@
 
         function copyToClipboard(text, element) {
             navigator.clipboard.writeText(text).then(() => {
-                element.classList.add('copy_clip_ok')
+                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);

{pywebexec-0.0.7 → pywebexec-0.0.9}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)

{pywebexec-0.0.7 → pywebexec-0.0.9/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.7
+Version: 0.0.9
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -53,6 +53,7 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-daemon>=2.3.2
 Requires-Dist: cryptography>=40.0.2
 Requires-Dist: Flask>=3.0.3
 Requires-Dist: Flask-HTTPAuth>=4.8.0
@@ -127,5 +128,5 @@ $ pywebexec start
 $ pywebexec status
 $ pywebexec stop
 ```
-* log of server are stored in current directory `.web_status/pwexec_<listen>:<port>.log`
+* log of server are stored in directory `[.config/].pywebexec/pywebexec_<listen>:<port>.log`
 

{pywebexec-0.0.7 → pywebexec-0.0.9}/pywebexec.egg-info/requires.txt

@@ -1,3 +1,4 @@
+python-daemon>=2.3.2
 cryptography>=40.0.2
 Flask>=3.0.3
 Flask-HTTPAuth>=4.8.0