pywebexec 0.0.3__tar.gz → 0.0.7__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.3
+Version: 0.0.7
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -78,12 +78,13 @@ $ pip install pywebexec
 $ pywebexec
 ```
 
-* Launch commands with params/view live output/Status using browser `http://<yourserver>:8080`
+* Launch commands with params/view live output/Status using browser
+![image](https://github.com/user-attachments/assets/921da56f-6d4b-46e3-b16c-e01a2dc9accf)
 
 ## features
 
 * Serve executables in current directory
-* Launch commands with params from web browser
+* Launch commands with params from web browser or API call
 * Follow live output
 * Stop command
 * Relaunch command

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

@@ -19,12 +19,13 @@ $ pip install pywebexec
 $ pywebexec
 ```
 
-* Launch commands with params/view live output/Status using browser `http://<yourserver>:8080`
+* Launch commands with params/view live output/Status using browser
+![image](https://github.com/user-attachments/assets/921da56f-6d4b-46e3-b16c-e01a2dc9accf)
 
 ## features
 
 * Serve executables in current directory
-* Launch commands with params from web browser
+* Launch commands with params from web browser or API call
 * Follow live output
 * Stop command
 * Relaunch command

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

@@ -53,4 +53,4 @@ build-backend = "setuptools.build_meta"
 version_file = "pywebexec/version.py"
 
 [project.scripts]
-pywebexec = "pywebexec.pywebexec:start_gunicorn"
+pywebexec = "pywebexec.pywebexec:main"

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

@@ -16,7 +16,7 @@ app = Flask(__name__)
 auth = HTTPBasicAuth()
 
 # Directory to store the script status and output
-SCRIPT_STATUS_DIR = 'script_status'
+SCRIPT_STATUS_DIR = '.web_status'
 
 if not os.path.exists(SCRIPT_STATUS_DIR):
     os.makedirs(SCRIPT_STATUS_DIR)
@@ -48,11 +48,46 @@ def start_gunicorn():
     options = {
         'bind': '%s:%s' % (args.listen, args.port),
         'workers': 4,
+        'timeout': 600,
         'certfile': args.cert,
         'keyfile': args.key,
     }
     StandaloneApplication(app, options=options).run()
 
+def daemon_d(action, pidfilepath, hostname=None, args=None):
+    """start/stop daemon"""
+    import signal
+    import daemon, daemon.pidfile
+
+    pidfile = daemon.pidfile.TimeoutPIDLockFile(pidfilepath+".pid", acquire_timeout=30)
+    if action == "stop":
+        if pidfile.is_locked():
+            pid = pidfile.read_pid()
+            print(f"Stopping server pid {pid}")
+            try:
+                os.kill(pid, signal.SIGINT)
+            except:
+                return False
+            return True
+    elif action == "status":
+        status = pidfile.is_locked()
+        if status:
+            print(f"pywebexec running pid {pidfile.read_pid()}")
+            return True
+        print("pywebexec not running")
+        return False
+    elif action == "start":
+        print(f"Starting server")
+        log = open(pidfilepath + ".log", "ab+")
+        daemon_context = daemon.DaemonContext(
+            stderr=log,
+            pidfile=pidfile,
+            umask=0o077,
+            working_directory=os.getcwd(),
+        )
+        with daemon_context:
+            start_gunicorn()
+
 def parseargs():
     global app, args
     parser = argparse.ArgumentParser(description='Run the script execution server.')
@@ -76,6 +111,7 @@ def parseargs():
     )
     parser.add_argument("-c", "--cert", type=str, help="Path to https certificate")
     parser.add_argument("-k", "--key", type=str, help="Path to https certificate key")
+    parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status", choices=["start","stop","restart","status"])
 
     args = parser.parse_args()
 
@@ -99,7 +135,7 @@ def get_status_file_path(script_id):
 def get_output_file_path(script_id):
     return os.path.join(SCRIPT_STATUS_DIR, f'{script_id}_output.txt')
 
-def update_script_status(script_id, status, script_name=None, params=None, start_time=None, end_time=None, exit_code=None):
+def update_script_status(script_id, status, script_name=None, params=None, start_time=None, end_time=None, exit_code=None, pid=None):
     status_file_path = get_status_file_path(script_id)
     status_data = read_script_status(script_id) or {}
     status_data['status'] = status
@@ -113,6 +149,8 @@ def update_script_status(script_id, status, script_name=None, params=None, start
         status_data['end_time'] = end_time
     if exit_code is not None:
         status_data['exit_code'] = exit_code
+    if pid is not None:
+        status_data['pid'] = pid
     with open(status_file_path, 'w') as f:
         json.dump(status_data, f)
 
@@ -134,6 +172,7 @@ def run_script(script_name, params, script_id):
         with open(output_file_path, 'w') as output_file:
             # Run the script with parameters and redirect stdout and stderr to the file
             process = subprocess.Popen([script_name] + params, stdout=output_file, stderr=output_file, text=True)
+            update_script_status(script_id, 'running', pid=process.pid)
             processes[script_id] = process
             process.wait()
             processes.pop(script_id, None)
@@ -193,25 +232,26 @@ def run_script_endpoint():
 @app.route('/stop_script/<script_id>', methods=['POST'])
 @auth_required
 def stop_script(script_id):
-    process = processes.get(script_id)
+    status = read_script_status(script_id)
+    if not status or 'pid' not in status:
+        return jsonify({'error': 'Invalid script_id or script not running'}), 400
+
+    pid = status['pid']
     end_time = datetime.now().isoformat()
-    if process and process.poll() is None:
-        try:
-            process.terminate()
-            process.wait()  # Ensure the process has terminated
-            return jsonify({'message': 'Script aborted'})
-        except Exception as e:
-            status_data = read_script_status(script_id) or {}
-            status_data['status'] = 'failed'
-            status_data['end_time'] = end_time
-            status_data['exit_code'] = 1
-            with open(get_status_file_path(script_id), 'w') as f:
-                json.dump(status_data, f)
-            with open(get_output_file_path(script_id), 'a') as output_file:
-                output_file.write(str(e))
-            return jsonify({'error': 'Failed to terminate script'}), 500
-    update_script_status(script_id, 'failed', end_time=end_time, exit_code=1)
-    return jsonify({'error': 'Invalid script_id or script not running'}), 400
+    try:
+        os.kill(pid, 15)  # Send SIGTERM
+        update_script_status(script_id, 'aborted', end_time=end_time, exit_code=-15)
+        return jsonify({'message': 'Script aborted'})
+    except Exception as e:
+        status_data = read_script_status(script_id) or {}
+        status_data['status'] = 'failed'
+        status_data['end_time'] = end_time
+        status_data['exit_code'] = 1
+        with open(get_status_file_path(script_id), 'w') as f:
+            json.dump(status_data, f)
+        with open(get_output_file_path(script_id), 'a') as output_file:
+            output_file.write(str(e))
+        return jsonify({'error': 'Failed to terminate script'}), 500
 
 @app.route('/script_status/<script_id>', methods=['GET'])
 @auth_required
@@ -276,9 +316,12 @@ def list_executables():
 def verify_password(username, password):
     return username == app.config['USER'] and password == app.config['PASSWORD']
 
-
-
+def main():
+    if args.action:
+        daemon_d(args.action, pidfilepath=SCRIPT_STATUS_DIR+'/pywebexec')
+    else:
+        start_gunicorn()
 
 if __name__ == '__main__':
-    start_gunicorn()
-    #app.run(host='0.0.0.0', port=5000)
+    main()
+    # app.run(host='0.0.0.0', port=5000)

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

@@ -79,7 +79,12 @@
         .copy_clip_ok, .copy_clip_ok:hover {
             background-image: url("/static/images/copy_ok.svg");
         }
-
+        input {
+            width: 50%
+        }
+        .currentscript {
+            background-color: #eef;
+        }
     </style>
 </head>
 <body>
@@ -126,6 +131,7 @@
             });
             const data = await response.json();
             fetchScripts();
+            viewOutput(data.script_id)
         });
 
         async function fetchScripts() {
@@ -136,6 +142,7 @@
             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>
@@ -194,6 +201,7 @@
             } else {
                 fetchOutput(script_id);
             }
+            fetchScripts(); // Refresh the script list to highlight the current script
         }
 
         async function relaunchScript(script_id) {
@@ -214,8 +222,8 @@
                 })
             });
             const relaunchData = await relaunchResponse.json();
-            alert(relaunchData.message);
             fetchScripts();
+            viewOutput(relaunchData.script_id)
         }
 
         async function stopScript(script_id) {

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

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pywebexec
-Version: 0.0.3
+Version: 0.0.7
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -78,12 +78,13 @@ $ pip install pywebexec
 $ pywebexec
 ```
 
-* Launch commands with params/view live output/Status using browser `http://<yourserver>:8080`
+* Launch commands with params/view live output/Status using browser
+![image](https://github.com/user-attachments/assets/921da56f-6d4b-46e3-b16c-e01a2dc9accf)
 
 ## features
 
 * Serve executables in current directory
-* Launch commands with params from web browser
+* Launch commands with params from web browser or API call
 * Follow live output
 * Stop command
 * Relaunch command

pywebexec-0.0.7/pywebexec.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pywebexec = pywebexec.pywebexec:main

pywebexec-0.0.3/pywebexec.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-pywebexec = pywebexec.pywebexec:start_gunicorn