feat: redesign portal UX and stabilize web session runtime
This commit is contained in:
23
universal-runtime/Dockerfile
Normal file
23
universal-runtime/Dockerfile
Normal file
@@ -0,0 +1,23 @@
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
chromium \
|
||||
xvfb \
|
||||
x11vnc \
|
||||
fluxbox \
|
||||
freerdp2-x11 \
|
||||
novnc \
|
||||
websockify \
|
||||
python3 \
|
||||
ca-certificates \
|
||||
fonts-dejavu-core \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
COPY manager.py /manager.py
|
||||
RUN chmod +x /entrypoint.sh
|
||||
|
||||
EXPOSE 6080
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
110
universal-runtime/entrypoint.sh
Normal file
110
universal-runtime/entrypoint.sh
Normal file
@@ -0,0 +1,110 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
IDLE_TIMEOUT="${IDLE_TIMEOUT:-1800}"
|
||||
SCREEN_GEOMETRY="${SCREEN_GEOMETRY:-1920x1080x24}"
|
||||
CHROME_WINDOW_SIZE="${CHROME_WINDOW_SIZE:-1920,1080}"
|
||||
ENABLE_HEARTBEAT="${ENABLE_HEARTBEAT:-1}"
|
||||
DISPLAY_NUM="${DISPLAY_NUM:-:1}"
|
||||
|
||||
mkdir -p /opt/portal
|
||||
cp -r /usr/share/novnc/* /opt/portal/
|
||||
|
||||
cat > /opt/portal/index.html <<'HTML'
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Universal Session</title>
|
||||
<style>
|
||||
html,body,#screen{margin:0;height:100%;background:#111}
|
||||
.status{
|
||||
position:fixed;
|
||||
left:12px;
|
||||
top:12px;
|
||||
z-index:50;
|
||||
padding:8px 10px;
|
||||
border-radius:8px;
|
||||
background:rgba(16,22,32,.86);
|
||||
border:1px solid rgba(255,255,255,.18);
|
||||
color:#dce8f5;
|
||||
font:600 13px/1.25 sans-serif;
|
||||
max-width:min(92vw,560px);
|
||||
}
|
||||
.status.error{
|
||||
background:rgba(85,20,20,.9);
|
||||
border-color:rgba(255,130,130,.36);
|
||||
color:#ffe3e3;
|
||||
}
|
||||
.status.hidden{display:none}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="screen"></div>
|
||||
<div id="status" class="status">Подключение к слоту...</div>
|
||||
<script type="module">
|
||||
import RFB from './core/rfb.js';
|
||||
const basePath = location.pathname.replace(/\/+$/, '');
|
||||
const wsUrl = (location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + basePath + '/websockify';
|
||||
const statusEl = document.getElementById('status');
|
||||
let connected = false;
|
||||
let connectTimer = null;
|
||||
|
||||
function showStatus(text, isError = false) {
|
||||
statusEl.textContent = text;
|
||||
statusEl.classList.toggle('error', !!isError);
|
||||
statusEl.classList.remove('hidden');
|
||||
}
|
||||
|
||||
function hideStatus() {
|
||||
statusEl.classList.add('hidden');
|
||||
}
|
||||
|
||||
showStatus('Подключение к слоту...');
|
||||
connectTimer = setTimeout(() => {
|
||||
if (!connected) {
|
||||
showStatus('Нет подключения к экрану слота. Откройте сервис заново из дашборда.', true);
|
||||
}
|
||||
}, 8000);
|
||||
|
||||
const rfb = new RFB(document.getElementById('screen'), wsUrl);
|
||||
rfb.viewOnly = false;
|
||||
rfb.scaleViewport = true;
|
||||
rfb.resizeSession = true;
|
||||
rfb.addEventListener('connect', () => {
|
||||
connected = true;
|
||||
if (connectTimer) clearTimeout(connectTimer);
|
||||
hideStatus();
|
||||
});
|
||||
rfb.addEventListener('disconnect', () => {
|
||||
connected = false;
|
||||
showStatus('Соединение со слотом потеряно. Запустите сервис заново.', true);
|
||||
});
|
||||
|
||||
const enableHeartbeat = (new URLSearchParams(location.search).get('hb') ?? '1') !== '0';
|
||||
const sid = new URLSearchParams(location.search).get('sid');
|
||||
async function touch() {
|
||||
if (!sid) return;
|
||||
try {
|
||||
await fetch(`/api/sessions/${sid}/touch`, {method:'POST', credentials:'include'});
|
||||
} catch (e) {}
|
||||
}
|
||||
if (enableHeartbeat) {
|
||||
setInterval(touch, 60000);
|
||||
touch();
|
||||
}
|
||||
document.addEventListener('contextmenu', (e) => e.preventDefault());
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
HTML
|
||||
|
||||
export DISPLAY="$DISPLAY_NUM"
|
||||
export CHROME_WINDOW_SIZE
|
||||
Xvfb "$DISPLAY_NUM" -screen 0 "$SCREEN_GEOMETRY" >/tmp/xvfb.log 2>&1 &
|
||||
fluxbox >/tmp/fluxbox.log 2>&1 &
|
||||
python3 /manager.py >/tmp/manager.log 2>&1 &
|
||||
x11vnc -display "$DISPLAY_NUM" -rfbport 5900 -forever -shared -nopw -noxdamage >/tmp/x11vnc.log 2>&1 &
|
||||
|
||||
exec websockify --verbose --idle-timeout="$IDLE_TIMEOUT" --web=/opt/portal 6080 localhost:5900
|
||||
159
universal-runtime/manager.py
Normal file
159
universal-runtime/manager.py
Normal file
@@ -0,0 +1,159 @@
|
||||
#!/usr/bin/env python3
|
||||
import json
|
||||
import os
|
||||
import signal
|
||||
import subprocess
|
||||
import threading
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
|
||||
DISPLAY = os.environ.get("DISPLAY", ":1")
|
||||
CHROME_WINDOW_SIZE = os.environ.get("CHROME_WINDOW_SIZE", "1920,1080")
|
||||
|
||||
_state = {
|
||||
"proc": None,
|
||||
"mode": "idle",
|
||||
"target": "",
|
||||
}
|
||||
_lock = threading.Lock()
|
||||
|
||||
|
||||
def _stop_current() -> None:
|
||||
proc = _state.get("proc")
|
||||
if not proc:
|
||||
return
|
||||
try:
|
||||
os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
|
||||
proc.wait(timeout=4)
|
||||
except Exception:
|
||||
try:
|
||||
os.killpg(os.getpgid(proc.pid), signal.SIGKILL)
|
||||
except Exception:
|
||||
pass
|
||||
finally:
|
||||
_state["proc"] = None
|
||||
|
||||
|
||||
def _start_process(cmd: list[str], mode: str, target: str) -> None:
|
||||
_stop_current()
|
||||
logf = open("/tmp/session-app.log", "a", buffering=1)
|
||||
env = os.environ.copy()
|
||||
env["DISPLAY"] = DISPLAY
|
||||
proc = subprocess.Popen( # noqa: S603
|
||||
cmd,
|
||||
stdout=logf,
|
||||
stderr=subprocess.STDOUT,
|
||||
env=env,
|
||||
start_new_session=True,
|
||||
)
|
||||
_state["proc"] = proc
|
||||
_state["mode"] = mode
|
||||
_state["target"] = target
|
||||
|
||||
|
||||
def open_web(url: str) -> None:
|
||||
cmd = [
|
||||
"chromium",
|
||||
"--no-sandbox",
|
||||
"--disable-dev-shm-usage",
|
||||
"--disable-gpu",
|
||||
"--use-gl=swiftshader",
|
||||
"--kiosk",
|
||||
"--disable-translate",
|
||||
"--disable-features=TranslateUI,ExtensionsToolbarMenu",
|
||||
"--disable-pinch",
|
||||
"--overscroll-history-navigation=0",
|
||||
"--ignore-certificate-errors",
|
||||
"--allow-insecure-localhost",
|
||||
"--allow-running-insecure-content",
|
||||
f"--window-size={CHROME_WINDOW_SIZE}",
|
||||
"--no-first-run",
|
||||
"--no-default-browser-check",
|
||||
url,
|
||||
]
|
||||
_start_process(cmd, "web", url)
|
||||
|
||||
|
||||
def open_rdp(payload: dict) -> None:
|
||||
host = (payload.get("host") or "").strip()
|
||||
if not host:
|
||||
raise ValueError("host is required")
|
||||
port = str(payload.get("port") or "3389").strip()
|
||||
user = (payload.get("user") or "").strip()
|
||||
password = (payload.get("password") or "").strip()
|
||||
domain = (payload.get("domain") or "").strip()
|
||||
security = (payload.get("security") or "").strip().lower()
|
||||
|
||||
cmd = [
|
||||
"xfreerdp",
|
||||
f"/v:{host}:{port}",
|
||||
"/cert:ignore",
|
||||
"/f",
|
||||
"/dynamic-resolution",
|
||||
"/network:auto",
|
||||
"+clipboard",
|
||||
]
|
||||
if security:
|
||||
cmd.append(f"/sec:{security}")
|
||||
if user:
|
||||
cmd.append(f"/u:{user}")
|
||||
if password:
|
||||
cmd.append(f"/p:{password}")
|
||||
if domain:
|
||||
cmd.append(f"/d:{domain}")
|
||||
|
||||
safe_target = f"{host}:{port}"
|
||||
_start_process(cmd, "rdp", safe_target)
|
||||
|
||||
|
||||
class Handler(BaseHTTPRequestHandler):
|
||||
def _read_json(self):
|
||||
length = int(self.headers.get("Content-Length", "0"))
|
||||
if length <= 0:
|
||||
return {}
|
||||
raw = self.rfile.read(length)
|
||||
return json.loads(raw.decode("utf-8"))
|
||||
|
||||
def _json(self, code: int, payload: dict):
|
||||
body = json.dumps(payload).encode("utf-8")
|
||||
self.send_response(code)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.send_header("Content-Length", str(len(body)))
|
||||
self.end_headers()
|
||||
self.wfile.write(body)
|
||||
|
||||
def do_GET(self):
|
||||
if self.path == "/health":
|
||||
proc = _state.get("proc")
|
||||
running = bool(proc and proc.poll() is None)
|
||||
self._json(200, {"ok": True, "mode": _state.get("mode", "idle"), "running": running, "target": _state.get("target", "")})
|
||||
return
|
||||
self._json(404, {"detail": "Not found"})
|
||||
|
||||
def do_POST(self):
|
||||
try:
|
||||
data = self._read_json()
|
||||
if self.path == "/open":
|
||||
url = (data.get("url") or "").strip()
|
||||
if not (url.startswith("http://") or url.startswith("https://")):
|
||||
self._json(400, {"detail": "Invalid URL"})
|
||||
return
|
||||
with _lock:
|
||||
open_web(url)
|
||||
self._json(200, {"ok": True, "mode": "web", "target": url})
|
||||
return
|
||||
if self.path == "/rdp":
|
||||
with _lock:
|
||||
open_rdp(data)
|
||||
self._json(200, {"ok": True, "mode": "rdp"})
|
||||
return
|
||||
self._json(404, {"detail": "Not found"})
|
||||
except Exception as exc:
|
||||
self._json(500, {"detail": str(exc)})
|
||||
|
||||
def log_message(self, fmt, *args):
|
||||
return
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
server = HTTPServer(("0.0.0.0", 7000), Handler)
|
||||
server.serve_forever()
|
||||
Reference in New Issue
Block a user