diff --git a/.avalon/gen.py b/.avalon/gen.py index 8bc4982..d999470 100644 --- a/.avalon/gen.py +++ b/.avalon/gen.py @@ -3,5 +3,7 @@ binf = sys.argv[1] filesFolder = sys.argv[2] -with open(binf, 'w') as f: - f.write(f'#!/bin/bash\ncd "{filesFolder}"\npython3 "{filesFolder}/villicus.py" "$@"') +with open(binf, "w") as f: + f.write( + f'#!/bin/bash\ncd "{filesFolder}"\npython3 "{filesFolder}/villicus.py" "$@"' + ) diff --git a/source/bar.css b/source/bar.css deleted file mode 100644 index 8db602e..0000000 --- a/source/bar.css +++ /dev/null @@ -1,63 +0,0 @@ -/* The sidebar menu */ -.sidebar { - height: 100%; /* Full-height: remove this if you want "auto" height */ - width: 50px; /* Set the width of the sidebar */ - position: fixed; /* Fixed Sidebar (stay in place on scroll) */ - z-index: 1; /* Stay on top */ - top: 0; /* Stay at the top */ - left: 0; - background-color: #111; /* Black */ - overflow-x: hidden; /* Disable horizontal scroll */ - } - - .sidebar a { - padding: 6px; - text-decoration: none; - font-size: 25px; - color: #818181; - display: block; - background-color: #292929; - min-height: 38px; - max-height: 50px; - } - - .sidebar a img { - height: 44; - width: 38; - } - - .sidebar a:hover { - background-color: #636363; - } - - .main { - margin-left: 50px; /* Same as the width of the sidebar */ - padding: 0px 10px; - } - -.topbar { - background-color: #333; - overflow: hidden; - margin-left: 50px; - border-radius: 20px; - } - - .miniBarProgress { - vertical-align: middle; - color: white; - padding-top: 2px; - padding: 0px 0px 0px 0px; - height: 20px; - position: relative; - top: 0rem; - left: 0rem; - float: left; -} - -.inline { - display: inline-block; -} - -body { - background: #EEEEEE; -} \ No newline at end of file diff --git a/static/bar.css b/static/bar.css new file mode 100644 index 0000000..422fb5f --- /dev/null +++ b/static/bar.css @@ -0,0 +1,93 @@ +/* The sidebar menu */ +.sidebar { + display: flex; + height: 100%; /* Full-height: remove this if you want "auto" height */ + width: 50px; /* Set the width of the sidebar */ + position: fixed; /* Fixed Sidebar (stay in place on scroll) */ + z-index: 1; /* Stay on top */ + top: 0; /* Stay at the top */ + left: 0; + background-color: #111; /* Black */ + flex-direction: column; + justify-content: space-between; +} + +.sidebar a { + padding: 6px; + text-decoration: none; + font-size: 25px; + color: #818181; + display: block; + background-color: #292929; + min-height: 38px; + max-height: 50px; +} + +.sidebar a img { + height: 44; + width: 38; +} + +.sidebar a:hover { + background-color: #636363; +} + +.main { + margin-left: 50px; /* Same as the width of the sidebar */ + padding: 0px 10px; +} + +#statusdisplay > div.barsegment { + width: 50px; + height: 50px; + color: white; +} + +#statusdisplay > div.barsegment > div.barcontainer { + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +#statusdisplay > div.barsegment > div.barcontainer > div.bartext { + text-align: center; +} + +.inline { + display: inline-block; +} + +body { + font-family: arial, sans-serif; + background: #EEEEEE; +} + +.tooltip .tooltiptext { + visibility: hidden; + width: 120px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + position: relative; + z-index: 1; + top: -40px; + left: 110%;; +} + +.tooltip .tooltiptext::after { + content: ""; + position: absolute; + top: 50%; + right: 100%; + margin-top: -5px; + border-width: 5px; + border-style: solid; + border-color: transparent black transparent transparent; +} + +.tooltip:hover .tooltiptext { + visibility: visible; +} diff --git a/source/details-add.svg b/static/details-add.svg similarity index 100% rename from source/details-add.svg rename to static/details-add.svg diff --git a/source/details.svg b/static/details.svg similarity index 100% rename from source/details.svg rename to static/details.svg diff --git a/source/home.svg b/static/home.svg similarity index 100% rename from source/home.svg rename to static/home.svg diff --git a/static/js/bar.mjs b/static/js/bar.mjs new file mode 100644 index 0000000..f48d28f --- /dev/null +++ b/static/js/bar.mjs @@ -0,0 +1,57 @@ +import {html, render, Component, useState} from 'https://esm.sh/htm/preact/standalone' +import {httpGet} from '/static/js/common.mjs' + +function BarSegment(props) { + return html`
+
+
+ ${props.percentage}% +
+
+
+ ${props.type} +
+
`; +} + +class StatusBar extends Component { + state = { + running: 0, + paused: 0, + killed: 100, + done: 0 + }; + + makeSocket() { + this.socket = new WebSocket((window.location.protocol === "https:" ? "wss://" : "ws://") + window.location.host + "/ws/status"); + + this.socket.addEventListener('message', (event) => { + this.setState(JSON.parse(event.data)); + this.render(); + }); + + this.socket.addEventListener('close', (event) => { + console.warn("Status websocket disconnected, attempting reconnect..."); + + setTimeout(this.makeSocket.bind(this), 10000); + }); + } + + constructor() { + super(); + + this.makeSocket(); + } + + render() { + return html` +<${BarSegment} type=Running percentage=${this.state.running} color=darkgreen/> +<${BarSegment} type=Paused percentage=${this.state.paused} color=darkorange/> +<${BarSegment} type="Killed/Exited" percentage=${this.state.killed} color=darkred/> +<${BarSegment} type=Done percentage=${this.state.done} color="rgb(39, 28, 28)"/> +` + return httpGet("/status"); + } +} + +export {StatusBar, html, render} diff --git a/static/js/common.mjs b/static/js/common.mjs new file mode 100644 index 0000000..2ffe4a7 --- /dev/null +++ b/static/js/common.mjs @@ -0,0 +1,8 @@ +function httpGet(theUrl) { + var xmlHttp = new XMLHttpRequest(); + xmlHttp.open("GET", theUrl, false); // false for synchronous request + xmlHttp.send(null); + return xmlHttp.responseText; +} + +export {httpGet} diff --git a/source/kill.svg b/static/kill.svg similarity index 100% rename from source/kill.svg rename to static/kill.svg diff --git a/source/pause.svg b/static/pause.svg similarity index 100% rename from source/pause.svg rename to static/pause.svg diff --git a/source/play.svg b/static/play.svg similarity index 100% rename from source/play.svg rename to static/play.svg diff --git a/source/reload.svg b/static/reload.svg similarity index 100% rename from source/reload.svg rename to static/reload.svg diff --git a/source/restart.svg b/static/restart.svg similarity index 100% rename from source/restart.svg rename to static/restart.svg diff --git a/source/table.css b/static/table.css similarity index 100% rename from source/table.css rename to static/table.css diff --git a/templates/bar.html b/templates/bar.html index bbea561..14e269f 100644 --- a/templates/bar.html +++ b/templates/bar.html @@ -1,63 +1,37 @@ - - - Villicus - {% block head %} - {% endblock %} + + + + Villicus + {% block head %} + {% endblock %} -
-
0%
-
0%
-
100%
-
0%
+
+
+ + + + + {% block sidebuttons %} + {% endblock %}
- -
- - - - - {% block sidebuttons %} - {% endblock %} +
+
+
- - update(); - var t = setInterval(update, 5000); - - -
- {% block body %} - {% endblock %} -
+
+ {% block body %} + {% endblock %} +
- - diff --git a/templates/list.html b/templates/list.html index 5d3c481..139cf4a 100644 --- a/templates/list.html +++ b/templates/list.html @@ -12,7 +12,10 @@ {% for proc in procs %} {{ proc['process'] }} - {{ ((("Crashed" + " (Code " + str(proc['returncode']) + ")") if proc['returncode'] >= 0 else ("Killed" + " (Code " + str(proc['returncode']) + ")")) if proc['returncode'] else "Exited normally") if not proc['running'] else ("Paused" if proc['paused'] else "Running") }} + {{ ((("Crashed" + " (Code " + str(proc['returncode']) + + ")") if proc['returncode'] >= 0 else ("Killed" + " (Code " + + str(proc['returncode']) + ")")) if proc['returncode'] else + "Exited normally") if not proc['running'] else ("Paused" if proc['paused'] else "Running") }} {% if proc['paused'] %} @@ -29,4 +32,4 @@ {% endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/main.html b/templates/main.html index 242357c..c2e36de 100644 --- a/templates/main.html +++ b/templates/main.html @@ -4,100 +4,102 @@ {% endblock %} {% block body %}
-
+
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/proc.html b/templates/proc.html index fa71053..4e021a7 100644 --- a/templates/proc.html +++ b/templates/proc.html @@ -93,4 +93,4 @@ {% else %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/todo.md b/todo.md new file mode 100644 index 0000000..d1c91ba --- /dev/null +++ b/todo.md @@ -0,0 +1 @@ +- [ ] Prevent browser from fetching `out` if the program is no longer running. diff --git a/villicus.py b/villicus.py index 56b6e07..bfb60a9 100644 --- a/villicus.py +++ b/villicus.py @@ -1,4 +1,6 @@ from flask import * +from flask_sock import Sock + import toml import json import os @@ -6,18 +8,25 @@ import logging import click import sys +import time from fcntl import fcntl, F_GETFL, F_SETFL from os import O_NONBLOCK, read import signal +import threading from datetime import datetime -app = Flask('Villicus') -configfile = os.path.expanduser("~/.config/villicus.toml") -configdir = os.path.expanduser("~/.config/villicus/") +app = Flask("Villicus") +sock = Sock(app) + +app.config.update( + staticdir="static", + configfile=os.path.expanduser("~/.config/villicus.toml"), + configdir=os.path.expanduser("~/.config/villicus/"), +) #### Disable Logging #### -log = logging.getLogger('werkzeug') +log = logging.getLogger("werkzeug") log.setLevel(logging.ERROR) @@ -29,11 +38,12 @@ def echo(text, file=None, nl=None, err=None, color=None, **styles): pass -click.echo = echo -click.secho = secho +# click.echo = echo +# click.secho = secho #### Disable Logging #### +websockets = [] LASTUPDATE = datetime(year=1, month=1, day=1) cfg = {} @@ -46,58 +56,68 @@ def __init__(self, name, dct): self.process = None self.env = os.environ.copy() self.paused = False - if "start" in self.dct: - if self.dct["start"]: - self.start() - else: - self.start() self.curout = [] + + if "start" not in self.dct: + self.start() + return + + if self.dct["start"]: + self.start() + def start(self): proc = self.dct - + if "command" not in proc: return - + command = proc["command"] workdir = proc["workdir"] if "workdir" in proc else os.getcwd() if "env" in proc: - for var in proc['env'].keys(): - self.env[var] = proc['env'][var] - - self.process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, cwd=workdir, env=self.env, shell=True, preexec_fn=os.setsid) + for var in proc["env"].keys(): + self.env[var] = proc["env"][var] + + self.process = subprocess.Popen( + command, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + cwd=workdir, + env=self.env, + shell=True, + preexec_fn=os.setsid, + ) if not self.process: return - + flags = fcntl(self.process.stdout, F_GETFL) fcntl(self.process.stdout, F_SETFL, flags | O_NONBLOCK) def kill(self): if not self.process: return - - os.killpg(self.process.pid, signal.SIGTERM) + + try: + os.killpg(self.process.pid, signal.SIGTERM) + + except ProcessLookupError: + pass @property def out(self): - if not self.process: + if self.process is None: return "" - - o = "" - if self.running: - while True: - try: - o += read(self.process.stdout.fileno(), 4096).decode() - except OSError: - break - else: - o += self.process.stdout.read().decode() - if o.strip().strip("\n") != "": - self.curout.append(o.strip("\n")) + while 1: + tmp = self.process.stdout.readline() + + if not tmp and not self.process.poll(): + break + + self.curout.append(tmp.decode().strip("\n")) return "\n".join(self.curout) @@ -106,18 +126,20 @@ def running(self): if not self.paused: if self.process is not None: return self.process.poll() is None + else: return False + else: return True @property def returncode(self): - if not self.process: - return 0 - + if self.process is None: + return -111 + rt = self.process.returncode - return rt if rt else 0 + return rt if rt is not None else -111 class Procs: @@ -139,9 +161,18 @@ def killall(self): for process in self.dct.items(): try: process[1].kill() + except AttributeError: pass - + + +def wsThread(): + global proc_status + while True: + proc_status = getStatusAsJson() + + time.sleep(3) + procs = Procs() @@ -149,8 +180,11 @@ def killall(self): def listConfigFiles() -> list: c = [] - for root, dirs, files in os.walk(configdir): + for root, dirs, files in os.walk(app.config["configdir"]): for file in files: + if file.endswith("~") or file.endswith("#"): + continue + c.append(root.rstrip("/") + "/" + file) return c @@ -190,7 +224,6 @@ def saveConfig(newconfig): def startProcs(): global cfg - global procs cfg = loadConfig() chg = changed() @@ -206,18 +239,18 @@ def startProcs(): def start(): - global procs + if not os.path.exists(app.config["configdir"]): + os.mkdir(app.config["configdir"]) - if not os.path.exists(configdir): - os.mkdir(configdir) - - if os.path.exists(configfile): - with open(configfile, "r") as cf: + if os.path.exists(app.config["configfile"]): + with open(app.config["configfile"], "r") as cf: a = toml.load(cf) saveConfig(a) - os.remove(configfile) + os.remove(app.config["configfile"]) + + threading.Thread(target=wsThread, daemon=True).start() startProcs() @@ -243,8 +276,13 @@ def memUsage(): def cpuUsage(): - a = subprocess.check_output( - ["bash", "-c", "top -b -n1 | grep \"Cpu(s)\" | awk '{print $2+$4}'"]).decode().rstrip("\n") + a = ( + subprocess.check_output( + ["bash", "-c", "top -b -n1 | grep \"Cpu(s)\" | awk '{print $2+$4}'"] + ) + .decode() + .rstrip("\n") + ) return [float(a), 100 - float(a)] @@ -264,7 +302,6 @@ def killProc(proc): @app.route("/restart/") def restartProc(proc): - global cfg if proc in procs.dct.keys(): procs.proc(proc).kill() procs.start(proc, cfg[proc]) @@ -274,7 +311,6 @@ def restartProc(proc): @app.route("/start/") def startProc(proc): - global cfg procs.start(proc, cfg[proc]) return redirect("/proc/" + proc) @@ -308,71 +344,110 @@ def reloadAll(): return redirect("/list") -@app.route("/status") -def jsonStatus(): - if len(procs.dct.keys()) > 0: - running = 0 - paused = 0 - crashed = 0 - done = 0 - for proc in procs.dct.keys(): - prc = procs.proc(proc) - if not (prc.running and not prc.paused) and prc.returncode == 0: - done += 1 - elif not prc.running: - crashed += 1 - elif prc.running and not prc.paused: - running += 1 - elif prc.paused: - paused += 1 - - tprocs = len(procs.dct.keys()) - - runningpercent = running / tprocs - pausedpercent = paused / tprocs - crashedpercent = crashed / tprocs - donepercent = done / tprocs - - return json.dumps({ - "running": f"{round(runningpercent*100)}%", - "paused": f"{round(pausedpercent*100)}%", - "killed": f"{round(crashedpercent*100)}%", - "done": f"{round(donepercent*100)}%", - }) - else: - return json.dumps({ - "running": "0%", - "paused": "0%", - "killed": "100%", - "done": "0%", - }) - - -@app.route('/') +def getStatusAsJson(): + if len(procs.dct.keys()) == 0: + return json.dumps( + { + "running": "0", + "paused": "0", + "killed": "100", + "done": "0", + } + ) + + running = 0 + paused = 0 + crashed = 0 + done = 0 + + for proc in procs.dct.keys(): + prc = procs.proc(proc) + if not prc.running and not prc.paused and prc.returncode == 0: + done += 1 + + elif not prc.running: + crashed += 1 + + elif prc.running and not prc.paused: + running += 1 + + elif prc.paused: + paused += 1 + + tprocs = len(procs.dct.keys()) + + runningpercent = running / tprocs + pausedpercent = paused / tprocs + crashedpercent = crashed / tprocs + donepercent = done / tprocs + + return json.dumps( + { + "running": f"{round(runningpercent*100)}", + "paused": f"{round(pausedpercent*100)}", + "killed": f"{round(crashedpercent*100)}", + "done": f"{round(donepercent*100)}", + } + ) + + +@sock.route("/ws/status") +def ws_status(ws): + while True: + ws.send(proc_status) + + time.sleep(3) + + +@app.route("/") def home(): - return render_template('main.html', mem=str(memUsage()), cpu=str(cpuUsage())) + return render_template("main.html", mem=str(memUsage()), cpu=str(cpuUsage())) @app.route("/list") def listProcs(): - return render_template("list.html", procs=[{"running": procs.dct[i].running, "process":i, "paused":procs.dct[i].paused, "returncode":procs.dct[i].returncode} for i in procs.dct], str=str) + return render_template( + "list.html", + procs=[ + { + "running": procs.dct[i].running, + "process": i, + "paused": procs.dct[i].paused, + "returncode": procs.dct[i].returncode, + } + for i in procs.dct + ], + str=str, + ) @app.route("/proc/") def procShow(proc): - return render_template("proc.html", proc=proc, procdata=procs.proc(proc).dct, running=procs.proc(proc).running, paused=procs.proc(proc).paused, returncode=procs.proc(proc).returncode) + return render_template( + "proc.html", + proc=proc, + procdata=procs.proc(proc).dct, + running=procs.proc(proc).running, + paused=procs.proc(proc).paused, + returncode=procs.proc(proc).returncode, + ) + def cleanup_processes(signal, frame): procs.killall() sys.exit(0) - + + signal.signal(signal.SIGINT, cleanup_processes) -@app.route('/source/') +proc_status = getStatusAsJson() + + +@app.route("/source/") def returnSourceFile(filename): - return send_from_directory('source', filename) + return send_from_directory(app.config["staticdir"], filename) -if __name__ == '__main__': +if __name__ == "__main__": start() - app.run(host='0.0.0.0', port=4057) + app.run("0.0.0.0", port=4057)