Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 00394c287c | |||
| 2f6cab72c4 | |||
| 67d4c1cb99 | |||
| e33cc0ef3a | |||
| e3b20089f0 |
@@ -5,6 +5,59 @@ All notable changes to RigDoctor are recorded here. Format follows
|
|||||||
(`MAJOR.MINOR.PATCH`, pre-1.0). `__version__` and `pyproject.toml` must match the git
|
(`MAJOR.MINOR.PATCH`, pre-1.0). `__version__` and `pyproject.toml` must match the git
|
||||||
release tag (so the auto-updater, D18, can compare versions).
|
release tag (so the auto-updater, D18, can compare versions).
|
||||||
|
|
||||||
|
## [0.7.1] - 2026-05-21
|
||||||
|
### Fixed
|
||||||
|
- Shared terminal: a guest who joined **after** the host enabled the terminal stayed read-only.
|
||||||
|
The host now re-sends the terminal state when a guest joins, so the terminal is available.
|
||||||
|
- Inventory page no longer jumps back to the top when it refreshes (e.g. when elevated data
|
||||||
|
arrives) — scroll position is preserved and unchanged data isn't re-rendered.
|
||||||
|
- Shared terminal now follows the cursor to the bottom as output arrives (e.g. `ls -la`),
|
||||||
|
instead of staying scrolled up.
|
||||||
|
|
||||||
|
## [0.7.0] - 2026-05-21
|
||||||
|
### Added
|
||||||
|
- **Shared terminal (M12, Tier 3)**: when the host enables it, the session shares a real **PTY**
|
||||||
|
shell — the guest gets an interactive terminal (vim, top, tab-completion, Ctrl-C) running on
|
||||||
|
the host as the host's user. The host **reads along** live and can type too, e.g. a `sudo`
|
||||||
|
password — which stays local and is never sent to the guest. Off by default, host-consented.
|
||||||
|
The guest also pulls the host's inventory on join.
|
||||||
|
### Fixed
|
||||||
|
- **Input contrast**: all form controls (text fields, spin boxes, combo boxes, terminals) now
|
||||||
|
use the dark theme with readable text (Fusion defaulted them to light-on-light).
|
||||||
|
|
||||||
|
## [0.6.0] - 2026-05-21
|
||||||
|
### Added
|
||||||
|
- **Session sharing over the relay (M12)**: a **Share** tab — *Start shared session* (host)
|
||||||
|
hands you a short code and streams a read-only live view; *Enter share code* (guest) joins
|
||||||
|
someone else's session and views their sensors/health/inventory. Both connect outbound over
|
||||||
|
WebSocket to the relay (`relay_url`, default `wss://rigdoctor.jesseyvanofferen.com`), gated
|
||||||
|
by your Gitea access token — no port forwarding. Read-only.
|
||||||
|
|
||||||
|
## [0.5.0] - 2026-05-21
|
||||||
|
### Added
|
||||||
|
- **Session sharing (M12, Tier 2)**: `rigdoctor share serve` starts a **read-only** live view
|
||||||
|
(sensors auto-refresh + health report + inventory) over a local HTTP server, gated by a
|
||||||
|
random share token. Bind to localhost for local testing, or to all interfaces behind a
|
||||||
|
user-chosen tunnel (Tailscale/cloudflared/SSH) for remote help. No actions, no terminal.
|
||||||
|
(Tier 1 export and Tier 3 gated terminal still to come — D16.)
|
||||||
|
|
||||||
|
## [0.4.1] - 2026-05-21
|
||||||
|
### Fixed
|
||||||
|
- Checkbox contrast: a checked checkbox is now a clear accent-filled box with a checkmark
|
||||||
|
(was hard to tell checked from unchecked on the dark theme).
|
||||||
|
|
||||||
|
## [0.4.0] - 2026-05-21
|
||||||
|
### Added
|
||||||
|
- **Alerts (M8)**: desktop notifications (via `notify-send`) for **overheat** (GPU/CPU past a
|
||||||
|
threshold), **GPU-lost** (nvidia-smi timeout), and a **new version available** (fired once
|
||||||
|
per version). Edge-triggered with a cooldown so it doesn't spam. Degrades gracefully if
|
||||||
|
`notify-send` isn't installed.
|
||||||
|
- **Notifications page**: configure alerts (enable/disable, GPU/CPU temperature thresholds)
|
||||||
|
with a "Send test" button; changes apply live and persist to `config.toml`.
|
||||||
|
- **App icon**: ships a RigDoctor icon and shows it in the dock/launcher. The GUI
|
||||||
|
**self-registers** the icon + `.desktop` on launch (and sets the Wayland app-id), so a
|
||||||
|
self-update + relaunch picks it up — no need to re-run the installer.
|
||||||
|
|
||||||
## [0.3.2] - 2026-05-21
|
## [0.3.2] - 2026-05-21
|
||||||
### Changed
|
### Changed
|
||||||
- Replaced the per-page "Run with admin" buttons with a **single password prompt at launch**
|
- Replaced the per-page "Run with admin" buttons with a **single password prompt at launch**
|
||||||
|
|||||||
+2
-2
@@ -12,13 +12,13 @@ Status: ⬜ not started · 🟦 designing · 🟨 in progress · ✅ done
|
|||||||
| M3 | Crash-capture logger | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
| M3 | Crash-capture logger | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
||||||
| M4 | Health report (log scan) | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
| M4 | Health report (log scan) | Essential | none (opt: smartmontools) | all (NVIDIA first) | P0 | 🟨 |
|
||||||
| M2 | Live monitor (TUI) | Monitoring | none (stdlib curses) | all | P1 | ⬜ |
|
| M2 | Live monitor (TUI) | Monitoring | none (stdlib curses) | all | P1 | ⬜ |
|
||||||
| M8 | Alerting | Monitoring | libnotify (opt) | all | P2 | ⬜ |
|
| M8 | Alerting | Monitoring | libnotify (opt) | all | P2 | 🟨 |
|
||||||
| M5 | System inventory | Diagnostics | none (opt: lm-sensors, dmidecode) | all | P1 | 🟨 |
|
| M5 | System inventory | Diagnostics | none (opt: lm-sensors, dmidecode) | all | P1 | 🟨 |
|
||||||
| M6 | Gaming env checks | Diagnostics | none | all | P2 | ⬜ |
|
| M6 | Gaming env checks | Diagnostics | none | all | P2 | ⬜ |
|
||||||
| M10 | Desktop GUI | Desktop UI | **python3-pyside6** | all | P2 | 🟨 |
|
| M10 | Desktop GUI | Desktop UI | **python3-pyside6** | all | P2 | 🟨 |
|
||||||
| M11 | Tray / menu-bar applet | Desktop UI | **python3-pyside6** (+ AppIndicator on GNOME) | all | P2 | ⬜ |
|
| M11 | Tray / menu-bar applet | Desktop UI | **python3-pyside6** (+ AppIndicator on GNOME) | all | P2 | ⬜ |
|
||||||
| M9 | Installer | (meta) | none | all | P1 | 🟨 |
|
| M9 | Installer | (meta) | none | all | P1 | 🟨 |
|
||||||
| M12 | Session sharing / remote assist | Sharing | none (Tier 3: tmate/sshx) | all | P3 | ⬜ |
|
| M12 | Session sharing / remote assist | Sharing | none (Tier 3: tmate/sshx) | all | P3 | 🟨 |
|
||||||
| M13 | Auto-update | (core) | none (stdlib; user-local file swap) | all | P3 | 🟨 |
|
| M13 | Auto-update | (core) | none (stdlib; user-local file swap) | all | P3 | 🟨 |
|
||||||
| ~~M7~~ | ~~Stress / repro~~ | — | — | — | — | ❌ dropped (D7) |
|
| ~~M7~~ | ~~Stress / repro~~ | — | — | — | — | ❌ dropped (D7) |
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -58,10 +58,10 @@ Ubuntu + NVIDIA first; `.deb` distribution (see `DECISIONS.md`).
|
|||||||
Escalating ladder, built in order:
|
Escalating ladder, built in order:
|
||||||
- [ ] Tier 1: `share export` — diagnostic bundle (inventory + recent log + report); B opens
|
- [ ] Tier 1: `share export` — diagnostic bundle (inventory + recent log + report); B opens
|
||||||
it in RigDoctor. One-way, safest.
|
it in RigDoctor. One-way, safest.
|
||||||
- [ ] Tier 2: live read-only view (local server + user-chosen tunnel: Tailscale/cloudflared/
|
- [x] Tier 2: live read-only view — `rigdoctor share serve` (stdlib HTTP, token-gated:
|
||||||
SSH; no hosted relay), token-gated, A approves, revocable.
|
sensors + health + inventory). Remote = user-chosen tunnel; GUI controls still to add.
|
||||||
- [ ] Tier 3: gated interactive terminal (wrap tmate/sshx; read-only default, read-write on
|
- [x] Tier 3: host-consented interactive terminal — a real PTY shell shared over the relay
|
||||||
explicit consent), with session audit log.
|
(own `pty`, pyte-rendered guest), off by default; host reads along + can type (sudo).
|
||||||
|
|
||||||
> **Out of scope:** stress/repro module (D7); multi-distro support and packaging beyond
|
> **Out of scope:** stress/repro module (D7); multi-distro support and packaging beyond
|
||||||
> Ubuntu/apt + `.deb` (D15) — a thin seam is kept but not built out.
|
> Ubuntu/apt + `.deb` (D15) — a thin seam is kept but not built out.
|
||||||
|
|||||||
+16
-2
@@ -16,7 +16,8 @@ SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
|||||||
uninstall() {
|
uninstall() {
|
||||||
echo "Removing RigDoctor user-local install…"
|
echo "Removing RigDoctor user-local install…"
|
||||||
rm -rf "$VENV"
|
rm -rf "$VENV"
|
||||||
rm -f "$BIN_DIR/rigdoctor" "$BIN_DIR/rigdoctor-gui" "$DESKTOP_FILE"
|
rm -f "$BIN_DIR/rigdoctor" "$BIN_DIR/rigdoctor-gui" "$DESKTOP_FILE" \
|
||||||
|
"$DATA_HOME/icons/hicolor/scalable/apps/rigdoctor.svg"
|
||||||
echo "Done. (Config and logs under ~/.config/rigdoctor and ~/.local/share/rigdoctor were kept.)"
|
echo "Done. (Config and logs under ~/.config/rigdoctor and ~/.local/share/rigdoctor were kept.)"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,6 +82,17 @@ mkdir -p "$BIN_DIR"
|
|||||||
ln -sf "$VENV/bin/rigdoctor" "$BIN_DIR/rigdoctor"
|
ln -sf "$VENV/bin/rigdoctor" "$BIN_DIR/rigdoctor"
|
||||||
ln -sf "$VENV/bin/rigdoctor-gui" "$BIN_DIR/rigdoctor-gui"
|
ln -sf "$VENV/bin/rigdoctor-gui" "$BIN_DIR/rigdoctor-gui"
|
||||||
|
|
||||||
|
# Install the app icon (for the dock/launcher); fall back to a stock icon.
|
||||||
|
ICON_NAME=utilities-system-monitor
|
||||||
|
ICON_SRC=$("$VENV/bin/python" -c "import os, rigdoctor.gui as g; print(os.path.join(os.path.dirname(g.__file__), 'assets', 'rigdoctor.svg'))" 2>/dev/null || true)
|
||||||
|
if [ -n "$ICON_SRC" ] && [ -f "$ICON_SRC" ]; then
|
||||||
|
ICON_DST="$DATA_HOME/icons/hicolor/scalable/apps/rigdoctor.svg"
|
||||||
|
mkdir -p "$(dirname "$ICON_DST")"
|
||||||
|
cp "$ICON_SRC" "$ICON_DST"
|
||||||
|
ICON_NAME=rigdoctor
|
||||||
|
command -v gtk-update-icon-cache >/dev/null 2>&1 && gtk-update-icon-cache -qtf "$DATA_HOME/icons/hicolor" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p "$DESKTOP_DIR"
|
mkdir -p "$DESKTOP_DIR"
|
||||||
cat > "$DESKTOP_FILE" <<EOF
|
cat > "$DESKTOP_FILE" <<EOF
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@@ -88,10 +100,12 @@ Type=Application
|
|||||||
Name=RigDoctor
|
Name=RigDoctor
|
||||||
Comment=Hardware monitoring & crash diagnostics for Linux gamers
|
Comment=Hardware monitoring & crash diagnostics for Linux gamers
|
||||||
Exec=$VENV/bin/rigdoctor-gui
|
Exec=$VENV/bin/rigdoctor-gui
|
||||||
Icon=utilities-system-monitor
|
Icon=$ICON_NAME
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=System;Monitor;Utility;
|
Categories=System;Monitor;Utility;
|
||||||
|
StartupWMClass=rigdoctor
|
||||||
EOF
|
EOF
|
||||||
|
command -v update-desktop-database >/dev/null 2>&1 && update-desktop-database "$DESKTOP_DIR" 2>/dev/null || true
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "RigDoctor $("$VENV/bin/rigdoctor" --version 2>/dev/null | awk '{print $2}') installed."
|
echo "RigDoctor $("$VENV/bin/rigdoctor" --version 2>/dev/null | awk '{print $2}') installed."
|
||||||
|
|||||||
+5
-2
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "rigdoctor"
|
name = "rigdoctor"
|
||||||
version = "0.3.2"
|
version = "0.7.1"
|
||||||
description = "Modular hardware monitoring & crash diagnostics for Linux gamers."
|
description = "Modular hardware monitoring & crash diagnostics for Linux gamers."
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
@@ -13,7 +13,7 @@ requires-python = ">=3.11"
|
|||||||
dependencies = []
|
dependencies = []
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
gui = ["PySide6"]
|
gui = ["PySide6", "pyte"]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
rigdoctor = "rigdoctor.cli:main"
|
rigdoctor = "rigdoctor.cli:main"
|
||||||
@@ -21,3 +21,6 @@ rigdoctor-gui = "rigdoctor.gui.app:main"
|
|||||||
|
|
||||||
[tool.setuptools.packages.find]
|
[tool.setuptools.packages.find]
|
||||||
where = ["src"]
|
where = ["src"]
|
||||||
|
|
||||||
|
[tool.setuptools.package-data]
|
||||||
|
rigdoctor = ["gui/assets/*.svg"]
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
"""RigDoctor — modular hardware monitoring & crash diagnostics for Linux gamers."""
|
"""RigDoctor — modular hardware monitoring & crash diagnostics for Linux gamers."""
|
||||||
|
|
||||||
__version__ = "0.3.2"
|
__version__ = "0.7.1"
|
||||||
|
|||||||
@@ -295,6 +295,12 @@ def cmd_uninstall(args) -> int:
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def cmd_share_serve(args) -> int:
|
||||||
|
from .core import share
|
||||||
|
|
||||||
|
return share.serve(host=args.host, port=args.port)
|
||||||
|
|
||||||
|
|
||||||
def cmd_collect_priv(args) -> int:
|
def cmd_collect_priv(args) -> int:
|
||||||
"""Internal: emit root-only data (SMART + dmidecode) as JSON, run via pkexec at launch."""
|
"""Internal: emit root-only data (SMART + dmidecode) as JSON, run via pkexec at launch."""
|
||||||
from dataclasses import asdict
|
from dataclasses import asdict
|
||||||
@@ -405,6 +411,13 @@ def build_parser() -> argparse.ArgumentParser:
|
|||||||
cp = sub.add_parser("collect-priv", help=argparse.SUPPRESS) # internal: run via pkexec
|
cp = sub.add_parser("collect-priv", help=argparse.SUPPRESS) # internal: run via pkexec
|
||||||
cp.set_defaults(func=cmd_collect_priv)
|
cp.set_defaults(func=cmd_collect_priv)
|
||||||
|
|
||||||
|
share_p = sub.add_parser("share", help="session sharing (M12)")
|
||||||
|
share_sub = share_p.add_subparsers(dest="share_cmd", required=True)
|
||||||
|
serve_p = share_sub.add_parser("serve", help="serve a read-only live view (token-gated)")
|
||||||
|
serve_p.add_argument("--host", default="127.0.0.1", help="bind address (use 0.0.0.0 + a tunnel for remote)")
|
||||||
|
serve_p.add_argument("--port", type=int, default=8765, help="port")
|
||||||
|
serve_p.set_defaults(func=cmd_share_serve)
|
||||||
|
|
||||||
inv = sub.add_parser("inventory", help="system inventory (M5): export hardware/OS details")
|
inv = sub.add_parser("inventory", help="system inventory (M5): export hardware/OS details")
|
||||||
inv.add_argument("--json", action="store_true", help="output JSON")
|
inv.add_argument("--json", action="store_true", help="output JSON")
|
||||||
inv.add_argument("--markdown", action="store_true", help="output Markdown (for forum/bug reports)")
|
inv.add_argument("--markdown", action="store_true", help="output Markdown (for forum/bug reports)")
|
||||||
|
|||||||
@@ -139,6 +139,10 @@ DEFAULTS: dict = {
|
|||||||
"log_backups": 10, # keep this many rotated segments (bounds disk use)
|
"log_backups": 10, # keep this many rotated segments (bounds disk use)
|
||||||
"update_check_minutes": 30, # re-check for updates this often while running (0 = off)
|
"update_check_minutes": 30, # re-check for updates this often while running (0 = off)
|
||||||
"elevate_on_launch": True, # GUI asks for the password once at launch (SMART/dmidecode)
|
"elevate_on_launch": True, # GUI asks for the password once at launch (SMART/dmidecode)
|
||||||
|
"alerts_enabled": True, # desktop notifications on overheat / GPU-lost / new version
|
||||||
|
"gpu_temp_alert": 90.0, # °C — alert when GPU reaches this
|
||||||
|
"cpu_temp_alert": 95.0, # °C — alert when CPU reaches this
|
||||||
|
"relay_url": "wss://rigdoctor.jesseyvanofferen.com", # session-sharing relay (M12)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -154,3 +158,27 @@ def load_config() -> dict:
|
|||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
return cfg
|
return cfg
|
||||||
|
|
||||||
|
|
||||||
|
def _toml_value(value) -> str:
|
||||||
|
if isinstance(value, bool):
|
||||||
|
return "true" if value else "false"
|
||||||
|
if isinstance(value, (int, float)):
|
||||||
|
return repr(value)
|
||||||
|
return '"' + str(value).replace("\\", "\\\\").replace('"', '\\"') + '"'
|
||||||
|
|
||||||
|
|
||||||
|
def save_config(values: dict) -> None:
|
||||||
|
"""Write a flat config.toml (stdlib has no TOML writer)."""
|
||||||
|
CONFIG_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
lines = ["# RigDoctor config — edit in the app (Notifications) or here."]
|
||||||
|
lines += [f"{key} = {_toml_value(value)}" for key, value in values.items()]
|
||||||
|
CONFIG_FILE.write_text("\n".join(lines) + "\n")
|
||||||
|
|
||||||
|
|
||||||
|
def update_config(**changes) -> dict:
|
||||||
|
"""Merge changes into the current effective config and persist them."""
|
||||||
|
cfg = load_config()
|
||||||
|
cfg.update(changes)
|
||||||
|
save_config(cfg)
|
||||||
|
return cfg
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
"""Desktop alerts (M8): notify on overheat / GPU-lost / new version via notify-send.
|
||||||
|
|
||||||
|
Edge-triggered: an alert fires when a condition becomes true (not every sample), and
|
||||||
|
can fire again only after it has cleared and a cooldown has passed — so a hot GPU or a
|
||||||
|
1-Hz sample loop doesn't spam notifications. Degrades to a no-op if notify-send is absent.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import time
|
||||||
|
|
||||||
|
from .sample import Sample
|
||||||
|
|
||||||
|
APP_NAME = "RigDoctor"
|
||||||
|
_ICON = "utilities-system-monitor"
|
||||||
|
|
||||||
|
|
||||||
|
def available() -> bool:
|
||||||
|
return shutil.which("notify-send") is not None
|
||||||
|
|
||||||
|
|
||||||
|
def notify(title: str, message: str, urgency: str = "normal") -> bool:
|
||||||
|
"""Send a desktop notification (best-effort). urgency: low|normal|critical."""
|
||||||
|
if not available():
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
subprocess.run(
|
||||||
|
["notify-send", "-a", APP_NAME, "-u", urgency, "-i", _ICON, title, message],
|
||||||
|
timeout=10,
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
except (subprocess.SubprocessError, OSError):
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
class AlertMonitor:
|
||||||
|
"""Evaluate samples and raise edge-triggered desktop alerts."""
|
||||||
|
|
||||||
|
def __init__(self, gpu_temp: float = 90.0, cpu_temp: float = 95.0, cooldown: float = 300.0):
|
||||||
|
self.gpu_temp = gpu_temp
|
||||||
|
self.cpu_temp = cpu_temp
|
||||||
|
self.cooldown = cooldown
|
||||||
|
self.enabled = True
|
||||||
|
self._active: dict[str, bool] = {}
|
||||||
|
self._last: dict[str, float] = {}
|
||||||
|
|
||||||
|
def _fire(self, key: str, title: str, message: str, urgency: str = "critical") -> None:
|
||||||
|
if self._active.get(key):
|
||||||
|
return # already alerting; wait until it clears
|
||||||
|
now = time.time()
|
||||||
|
if now - self._last.get(key, 0.0) < self.cooldown:
|
||||||
|
return
|
||||||
|
self._active[key] = True
|
||||||
|
self._last[key] = now
|
||||||
|
notify(title, message, urgency)
|
||||||
|
|
||||||
|
def _clear(self, key: str) -> None:
|
||||||
|
self._active[key] = False
|
||||||
|
|
||||||
|
def check(self, sample: Sample) -> None:
|
||||||
|
if not self.enabled:
|
||||||
|
return
|
||||||
|
gpu_t = next(
|
||||||
|
(r.value for r in sample.readings
|
||||||
|
if r.source == "gpu" and r.metric == "temp" and r.label == "" and r.value is not None),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
if gpu_t is not None:
|
||||||
|
if gpu_t >= self.gpu_temp:
|
||||||
|
self._fire("gpu_temp", "GPU overheating", f"GPU at {gpu_t:.0f} °C")
|
||||||
|
else:
|
||||||
|
self._clear("gpu_temp")
|
||||||
|
|
||||||
|
cpu_temps = [r.value for r in sample.readings
|
||||||
|
if r.source == "cpu" and r.metric == "temp" and r.value is not None]
|
||||||
|
if cpu_temps:
|
||||||
|
cpu_t = max(cpu_temps)
|
||||||
|
if cpu_t >= self.cpu_temp:
|
||||||
|
self._fire("cpu_temp", "CPU overheating", f"CPU at {cpu_t:.0f} °C")
|
||||||
|
else:
|
||||||
|
self._clear("cpu_temp")
|
||||||
|
|
||||||
|
lost = any(r.source == "gpu" and r.metric == "status" and r.label == "query-timeout"
|
||||||
|
for r in sample.readings)
|
||||||
|
if lost:
|
||||||
|
self._fire("gpu_lost", "GPU not responding", "nvidia-smi query timed out — the GPU may have dropped")
|
||||||
|
else:
|
||||||
|
self._clear("gpu_lost")
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
"""A pseudo-terminal running the host's shell (M12, Tier 3 — host side).
|
||||||
|
|
||||||
|
Spawns the user's login shell in a real PTY so interactive programs work over a shared
|
||||||
|
session: vim, top, tab-completion, colours, Ctrl-C, and `sudo` (which prompts inside the
|
||||||
|
PTY — the host types that password locally, so it's never sent to the guest). Runs as the
|
||||||
|
host's own user — never elevated. Linux-only (uses `pty`/`termios`).
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import fcntl
|
||||||
|
import os
|
||||||
|
import pty
|
||||||
|
import signal
|
||||||
|
import struct
|
||||||
|
import termios
|
||||||
|
|
||||||
|
|
||||||
|
class PtySession:
|
||||||
|
def __init__(self, rows: int = 24, cols: int = 80):
|
||||||
|
self.pid, self.master_fd = pty.fork()
|
||||||
|
if self.pid == 0: # child: become the shell
|
||||||
|
os.environ["TERM"] = "xterm-256color"
|
||||||
|
shell = os.environ.get("SHELL", "/bin/bash")
|
||||||
|
try:
|
||||||
|
os.execvp(shell, [shell])
|
||||||
|
finally:
|
||||||
|
os._exit(1)
|
||||||
|
os.set_blocking(self.master_fd, False)
|
||||||
|
self.set_size(rows, cols)
|
||||||
|
|
||||||
|
def set_size(self, rows: int, cols: int) -> None:
|
||||||
|
try:
|
||||||
|
fcntl.ioctl(self.master_fd, termios.TIOCSWINSZ, struct.pack("HHHH", rows, cols, 0, 0))
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def write(self, data: bytes) -> None:
|
||||||
|
try:
|
||||||
|
os.write(self.master_fd, data)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def read(self, size: int = 65536) -> bytes:
|
||||||
|
try:
|
||||||
|
return os.read(self.master_fd, size)
|
||||||
|
except (BlockingIOError, OSError):
|
||||||
|
return b""
|
||||||
|
|
||||||
|
def close(self) -> None:
|
||||||
|
try:
|
||||||
|
os.close(self.master_fd)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
os.kill(self.pid, signal.SIGHUP)
|
||||||
|
os.waitpid(self.pid, os.WNOHANG)
|
||||||
|
except (OSError, ChildProcessError, ProcessLookupError):
|
||||||
|
pass
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
"""Session sharing (M12, Tier 2): a read-only live view over a local HTTP server.
|
||||||
|
|
||||||
|
Serves the live sensor snapshot + health report + inventory, **read-only**, gated by a
|
||||||
|
random share token. Bind to localhost for local testing, or to all interfaces behind a
|
||||||
|
user-chosen tunnel (Tailscale / cloudflared / SSH) for remote help. No actions, no terminal.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import secrets
|
||||||
|
from dataclasses import asdict
|
||||||
|
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||||
|
from urllib.parse import parse_qs, urlparse
|
||||||
|
|
||||||
|
from .sampler import Sampler
|
||||||
|
from .sources import available_sources
|
||||||
|
|
||||||
|
_PAGE = """<!doctype html>
|
||||||
|
<html><head><meta charset="utf-8"><title>RigDoctor — shared</title>
|
||||||
|
<style>
|
||||||
|
body{background:#101216;color:#e6e8eb;font-family:system-ui,sans-serif;margin:0;padding:24px}
|
||||||
|
h1{font-size:20px;margin:0 0 4px} h2{font-size:14px;color:#8b929c;margin:18px 0 6px}
|
||||||
|
.card{background:#1b1f26;border:1px solid #2a2f39;border-radius:12px;padding:16px;margin:14px 0}
|
||||||
|
table{width:100%;border-collapse:collapse} td{padding:3px 0;font-size:14px}
|
||||||
|
td.v{text-align:right;font-weight:600} .muted{color:#8b929c}
|
||||||
|
.critical{color:#f87171} .warning{color:#fb923c} .ok{color:#4ade80} .info{color:#8b929c}
|
||||||
|
.badge{display:inline-block;background:#38bdf8;color:#06222e;border-radius:6px;padding:1px 8px;font-size:12px;font-weight:700}
|
||||||
|
</style></head><body>
|
||||||
|
<h1>RigDoctor <span class="badge">read-only share</span></h1>
|
||||||
|
<p class="muted">A live view shared by the machine's owner. You can look, not change anything.</p>
|
||||||
|
<div class="card"><div id="live">loading…</div></div>
|
||||||
|
<div class="card"><h2 style="margin-top:0">Health</h2><div id="health">loading…</div></div>
|
||||||
|
<div class="card"><h2 style="margin-top:0">Inventory</h2><div id="inv">loading…</div></div>
|
||||||
|
<script>
|
||||||
|
const T=new URLSearchParams(location.search).get('t');
|
||||||
|
const j=async p=>(await fetch(p+'?t='+encodeURIComponent(T))).json();
|
||||||
|
const fmt=(v,u)=>v==null?'N/A':(u==='\\u00b0C'?(+v).toFixed(1)+' °C':(u?v+' '+u:v));
|
||||||
|
async function live(){try{const d=await j('/api/snapshot');let h='';
|
||||||
|
for(const[g,items]of Object.entries(d.groups)){h+='<h2>'+g.toUpperCase()+'</h2><table>';
|
||||||
|
for(const it of items)h+='<tr><td class="muted">'+it.name+'</td><td class="v">'+fmt(it.value,it.unit)+'</td></tr>';
|
||||||
|
h+='</table>';}document.getElementById('live').innerHTML=h;}catch(e){}}
|
||||||
|
async function once(){try{const r=await j('/api/report');
|
||||||
|
document.getElementById('health').innerHTML=r.map(f=>'<div><span class="'+f.severity+'">['+f.severity.toUpperCase()+']</span> '+f.category+': '+f.title+'</div>').join('')||'no findings';}catch(e){}
|
||||||
|
try{const inv=await j('/api/inventory');let h='';
|
||||||
|
for(const[s,kv]of Object.entries(inv)){h+='<h2>'+s+'</h2><table>';
|
||||||
|
for(const[k,v]of Object.entries(kv))h+='<tr><td class="muted">'+k+'</td><td class="v">'+v+'</td></tr>';
|
||||||
|
h+='</table>';}document.getElementById('inv').innerHTML=h;}catch(e){}}
|
||||||
|
live();once();setInterval(live,2000);
|
||||||
|
</script></body></html>"""
|
||||||
|
|
||||||
|
|
||||||
|
def _snapshot(sampler: Sampler) -> dict:
|
||||||
|
sample = sampler.sample()
|
||||||
|
groups: dict[str, list] = {}
|
||||||
|
for r in sample.readings:
|
||||||
|
if r.metric == "name":
|
||||||
|
item = {"name": "device", "value": r.label, "unit": ""}
|
||||||
|
else:
|
||||||
|
item = {"name": (r.label + " " + r.metric).strip() if r.label else r.metric,
|
||||||
|
"value": r.value, "unit": r.unit}
|
||||||
|
groups.setdefault(r.source, []).append(item)
|
||||||
|
return {"ts": sample.ts, "groups": groups}
|
||||||
|
|
||||||
|
|
||||||
|
def _report() -> list:
|
||||||
|
from .health import run_health_checks
|
||||||
|
return [asdict(f) for f in run_health_checks()]
|
||||||
|
|
||||||
|
|
||||||
|
def _inventory() -> dict:
|
||||||
|
from .inventory import collect, to_dict
|
||||||
|
return to_dict(collect())
|
||||||
|
|
||||||
|
|
||||||
|
# --- Relay (M12) frames: a host streams these; a guest renders them. -----------------
|
||||||
|
|
||||||
|
def host_full_frame(sampler: Sampler) -> str:
|
||||||
|
"""Initial frame: live snapshot + health report + inventory."""
|
||||||
|
return json.dumps({"type": "full", "snapshot": _snapshot(sampler),
|
||||||
|
"report": _report(), "inventory": _inventory()})
|
||||||
|
|
||||||
|
|
||||||
|
def host_snapshot_frame(sampler: Sampler) -> str:
|
||||||
|
"""Recurring frame: just the live snapshot."""
|
||||||
|
return json.dumps({"type": "snapshot", "snapshot": _snapshot(sampler)})
|
||||||
|
|
||||||
|
|
||||||
|
def _fmt(value, unit: str) -> str:
|
||||||
|
if value is None:
|
||||||
|
return "N/A"
|
||||||
|
if unit == "°C":
|
||||||
|
try:
|
||||||
|
return f"{float(value):.1f} °C"
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return str(value)
|
||||||
|
return f"{value} {unit}".strip()
|
||||||
|
|
||||||
|
|
||||||
|
def guest_html(snapshot: dict | None, report: list | None, inventory: dict | None) -> str:
|
||||||
|
"""Render a received frame as read-only dark HTML for the guest's view."""
|
||||||
|
import html as _html
|
||||||
|
|
||||||
|
def esc(x) -> str:
|
||||||
|
return _html.escape(str(x))
|
||||||
|
|
||||||
|
out = ['<div style="font-family:sans-serif;color:#e6e8eb">']
|
||||||
|
if snapshot:
|
||||||
|
for group, items in snapshot.get("groups", {}).items():
|
||||||
|
out.append(f'<h3 style="color:#8b929c">{esc(group).upper()}</h3><table width="100%">')
|
||||||
|
for it in items:
|
||||||
|
out.append(f'<tr><td style="color:#8b929c">{esc(it.get("name"))}</td>'
|
||||||
|
f'<td align="right"><b>{esc(_fmt(it.get("value"), it.get("unit", "")))}</b></td></tr>')
|
||||||
|
out.append("</table>")
|
||||||
|
if report:
|
||||||
|
out.append('<h3 style="color:#8b929c">HEALTH</h3>')
|
||||||
|
colors = {"critical": "#f87171", "warning": "#fb923c", "ok": "#4ade80"}
|
||||||
|
for f in report:
|
||||||
|
sev = f.get("severity", "info")
|
||||||
|
out.append(f'<div><span style="color:{colors.get(sev, "#8b929c")}">[{esc(sev).upper()}]</span> '
|
||||||
|
f'{esc(f.get("category"))}: {esc(f.get("title"))}</div>')
|
||||||
|
if inventory:
|
||||||
|
out.append('<h3 style="color:#8b929c">INVENTORY</h3>')
|
||||||
|
for section, kv in inventory.items():
|
||||||
|
out.append(f'<h4 style="margin:6px 0;color:#8b929c">{esc(section)}</h4><table width="100%">')
|
||||||
|
for k, v in kv.items():
|
||||||
|
out.append(f'<tr><td style="color:#8b929c">{esc(k)}</td><td align="right"><b>{esc(v)}</b></td></tr>')
|
||||||
|
out.append("</table>")
|
||||||
|
out.append("</div>")
|
||||||
|
return "".join(out)
|
||||||
|
|
||||||
|
|
||||||
|
class _Handler(BaseHTTPRequestHandler):
|
||||||
|
def log_message(self, *args): # quiet
|
||||||
|
pass
|
||||||
|
|
||||||
|
def _authed(self, query: dict) -> bool:
|
||||||
|
return secrets.compare_digest(query.get("t", [""])[0], self.server.token)
|
||||||
|
|
||||||
|
def _send(self, code: int, ctype: str, body: bytes) -> None:
|
||||||
|
self.send_response(code)
|
||||||
|
self.send_header("Content-Type", ctype)
|
||||||
|
self.send_header("Content-Length", str(len(body)))
|
||||||
|
self.end_headers()
|
||||||
|
self.wfile.write(body)
|
||||||
|
|
||||||
|
def do_GET(self) -> None: # noqa: N802
|
||||||
|
parsed = urlparse(self.path)
|
||||||
|
if not self._authed(parse_qs(parsed.query)):
|
||||||
|
self._send(403, "text/plain", b"Forbidden: missing or invalid share token")
|
||||||
|
return
|
||||||
|
if parsed.path == "/":
|
||||||
|
self._send(200, "text/html; charset=utf-8", _PAGE.encode())
|
||||||
|
elif parsed.path == "/api/snapshot":
|
||||||
|
self._send(200, "application/json", json.dumps(_snapshot(self.server.sampler)).encode())
|
||||||
|
elif parsed.path == "/api/report":
|
||||||
|
self._send(200, "application/json", json.dumps(_report()).encode())
|
||||||
|
elif parsed.path == "/api/inventory":
|
||||||
|
self._send(200, "application/json", json.dumps(_inventory()).encode())
|
||||||
|
else:
|
||||||
|
self._send(404, "text/plain", b"Not found")
|
||||||
|
|
||||||
|
|
||||||
|
class _Server(ThreadingHTTPServer):
|
||||||
|
daemon_threads = True
|
||||||
|
|
||||||
|
def __init__(self, addr, token: str):
|
||||||
|
super().__init__(addr, _Handler)
|
||||||
|
self.token = token
|
||||||
|
self.sampler = Sampler(available_sources())
|
||||||
|
|
||||||
|
|
||||||
|
def make_server(host: str = "127.0.0.1", port: int = 0, token: str | None = None) -> tuple[_Server, str]:
|
||||||
|
token = token or secrets.token_urlsafe(16)
|
||||||
|
return _Server((host, port), token), token
|
||||||
|
|
||||||
|
|
||||||
|
def serve(host: str = "127.0.0.1", port: int = 8765) -> int:
|
||||||
|
srv, token = make_server(host, port)
|
||||||
|
url = f"http://{host}:{srv.server_address[1]}/?t={token}"
|
||||||
|
print(
|
||||||
|
f"Sharing a read-only live view at:\n {url}\n\n"
|
||||||
|
"Anyone with this URL (and network access to this host) can VIEW your sensors,\n"
|
||||||
|
"health report, and inventory — read-only. For remote help, expose it via a tunnel\n"
|
||||||
|
"(Tailscale / cloudflared / `ssh -R`). Press Ctrl-C to stop sharing.",
|
||||||
|
flush=True,
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
srv.serve_forever()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print("\nStopped sharing.")
|
||||||
|
finally:
|
||||||
|
srv.shutdown()
|
||||||
|
return 0
|
||||||
@@ -23,6 +23,7 @@ def targets(purge: bool = False) -> list[Path]:
|
|||||||
home / ".local" / "bin" / "rigdoctor",
|
home / ".local" / "bin" / "rigdoctor",
|
||||||
home / ".local" / "bin" / "rigdoctor-gui",
|
home / ".local" / "bin" / "rigdoctor-gui",
|
||||||
share / "applications" / "rigdoctor.desktop",
|
share / "applications" / "rigdoctor.desktop",
|
||||||
|
share / "icons" / "hicolor" / "scalable" / "apps" / "rigdoctor.svg",
|
||||||
]
|
]
|
||||||
if purge:
|
if purge:
|
||||||
items += [config.CONFIG_DIR, config.STATE_DIR, config.DATA_DIR]
|
items += [config.CONFIG_DIR, config.STATE_DIR, config.DATA_DIR]
|
||||||
|
|||||||
@@ -3,18 +3,28 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from PySide6.QtGui import QIcon
|
||||||
from PySide6.QtWidgets import QApplication
|
from PySide6.QtWidgets import QApplication
|
||||||
|
|
||||||
from ..config import load_config
|
from ..config import load_config
|
||||||
|
from . import desktop
|
||||||
from .main_window import MainWindow
|
from .main_window import MainWindow
|
||||||
from .theme import STYLESHEET
|
from .theme import STYLESHEET
|
||||||
|
|
||||||
|
ICON = Path(__file__).parent / "assets" / "rigdoctor.svg"
|
||||||
|
|
||||||
|
|
||||||
def main(argv: list[str] | None = None) -> int:
|
def main(argv: list[str] | None = None) -> int:
|
||||||
|
desktop.ensure() # self-register icon + .desktop so updates show it without re-installing
|
||||||
app = QApplication(argv if argv is not None else sys.argv)
|
app = QApplication(argv if argv is not None else sys.argv)
|
||||||
app.setApplicationName("RigDoctor")
|
app.setApplicationName("RigDoctor")
|
||||||
app.setApplicationDisplayName("RigDoctor")
|
app.setApplicationDisplayName("RigDoctor")
|
||||||
|
# Match the installed rigdoctor.desktop so the dock/launcher shows our icon (Wayland app-id).
|
||||||
|
app.setDesktopFileName("rigdoctor")
|
||||||
|
if ICON.exists():
|
||||||
|
app.setWindowIcon(QIcon(str(ICON)))
|
||||||
app.setStyle("Fusion")
|
app.setStyle("Fusion")
|
||||||
app.setStyleSheet(STYLESHEET)
|
app.setStyleSheet(STYLESHEET)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M3.5 8.5 L6.5 11.5 L12.5 4.5" fill="none" stroke="#06222e"
|
||||||
|
stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 237 B |
@@ -0,0 +1,8 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
|
||||||
|
<rect x="8" y="8" width="240" height="240" rx="52" fill="#15181e"/>
|
||||||
|
<circle cx="128" cy="128" r="84" fill="none" stroke="#2a2f39" stroke-width="14"/>
|
||||||
|
<path d="M128 44 a84 84 0 1 1 -59.4 24.6" fill="none" stroke="#38bdf8"
|
||||||
|
stroke-width="14" stroke-linecap="round"/>
|
||||||
|
<path d="M60 132 H100 L116 96 L140 168 L156 132 H196" fill="none" stroke="#e6e8eb"
|
||||||
|
stroke-width="14" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 533 B |
@@ -0,0 +1,51 @@
|
|||||||
|
"""Best-effort desktop integration: install our icon + .desktop so the dock shows it.
|
||||||
|
|
||||||
|
Runs at GUI launch (idempotent), so a self-update + relaunch refreshes the icon without
|
||||||
|
re-running install.sh. No-op for non-installed (dev) runs where the launcher is absent.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import shutil
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from .. import config
|
||||||
|
|
||||||
|
_ICON_SRC = Path(__file__).parent / "assets" / "rigdoctor.svg"
|
||||||
|
|
||||||
|
_DESKTOP = """[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=RigDoctor
|
||||||
|
Comment=Hardware monitoring & crash diagnostics for Linux gamers
|
||||||
|
Exec={exec}
|
||||||
|
Icon=rigdoctor
|
||||||
|
Terminal=false
|
||||||
|
Categories=System;Monitor;Utility;
|
||||||
|
StartupWMClass=rigdoctor
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def ensure() -> None:
|
||||||
|
share = config.DATA_DIR.parent # ~/.local/share
|
||||||
|
|
||||||
|
try:
|
||||||
|
if _ICON_SRC.exists():
|
||||||
|
icon_dst = share / "icons" / "hicolor" / "scalable" / "apps" / "rigdoctor.svg"
|
||||||
|
icon_dst.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
if not icon_dst.exists() or icon_dst.read_bytes() != _ICON_SRC.read_bytes():
|
||||||
|
shutil.copyfile(_ICON_SRC, icon_dst)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
gui_exec = Path(sys.executable).with_name("rigdoctor-gui")
|
||||||
|
if not gui_exec.exists(): # dev / not a normal install — don't fabricate a .desktop
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
desktop = share / "applications" / "rigdoctor.desktop"
|
||||||
|
content = _DESKTOP.format(exec=gui_exec)
|
||||||
|
desktop.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
if not desktop.exists() or desktop.read_text() != content:
|
||||||
|
desktop.write_text(content)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
@@ -81,7 +81,7 @@ class InventoryPage(QWidget):
|
|||||||
header.addWidget(self._refresh_btn)
|
header.addWidget(self._refresh_btn)
|
||||||
root.addLayout(header)
|
root.addLayout(header)
|
||||||
|
|
||||||
scroll = QScrollArea()
|
self._scroll = scroll = QScrollArea()
|
||||||
scroll.setWidgetResizable(True)
|
scroll.setWidgetResizable(True)
|
||||||
scroll.setFrameShape(QFrame.Shape.NoFrame)
|
scroll.setFrameShape(QFrame.Shape.NoFrame)
|
||||||
scroll.setStyleSheet("background: transparent;")
|
scroll.setStyleSheet("background: transparent;")
|
||||||
@@ -118,7 +118,11 @@ class InventoryPage(QWidget):
|
|||||||
if sections is None: # collection failed — keep current
|
if sections is None: # collection failed — keep current
|
||||||
self._status.setText("collection failed")
|
self._status.setText("collection failed")
|
||||||
return
|
return
|
||||||
|
if sections == self._sections: # unchanged — don't rebuild (would jump scroll)
|
||||||
|
self._status.setText("")
|
||||||
|
return
|
||||||
|
|
||||||
|
scroll_pos = self._scroll.verticalScrollBar().value()
|
||||||
self._sections = sections
|
self._sections = sections
|
||||||
while self._list.count():
|
while self._list.count():
|
||||||
item = self._list.takeAt(0)
|
item = self._list.takeAt(0)
|
||||||
@@ -129,6 +133,8 @@ class InventoryPage(QWidget):
|
|||||||
self._list.addWidget(_section_card(section))
|
self._list.addWidget(_section_card(section))
|
||||||
self._list.addStretch(1)
|
self._list.addStretch(1)
|
||||||
self._status.setText("")
|
self._status.setText("")
|
||||||
|
# restore scroll after the layout settles so re-renders don't yank to the top
|
||||||
|
QTimer.singleShot(0, lambda: self._scroll.verticalScrollBar().setValue(scroll_pos))
|
||||||
|
|
||||||
def _copy(self) -> None:
|
def _copy(self) -> None:
|
||||||
if self._sections:
|
if self._sections:
|
||||||
|
|||||||
@@ -26,16 +26,18 @@ from PySide6.QtWidgets import (
|
|||||||
|
|
||||||
from .. import __version__
|
from .. import __version__
|
||||||
from ..config import load_config
|
from ..config import load_config
|
||||||
from ..core import elevation, updates
|
from ..core import alerts, elevation, updates
|
||||||
from .dashboard import Dashboard
|
from .dashboard import Dashboard
|
||||||
from .health_page import HealthPage
|
from .health_page import HealthPage
|
||||||
from .inventory_page import InventoryPage
|
from .inventory_page import InventoryPage
|
||||||
|
from .notifications_page import NotificationsPage
|
||||||
from .recorder_page import RecorderPage
|
from .recorder_page import RecorderPage
|
||||||
from .setup_page import SetupPage
|
from .setup_page import SetupPage
|
||||||
|
from .share_page import SharePage
|
||||||
from .theme import ACCENT, GOOD, MUTED
|
from .theme import ACCENT, GOOD, MUTED
|
||||||
from .worker import SamplerWorker
|
from .worker import SamplerWorker
|
||||||
|
|
||||||
_NAV_ITEMS = ["Dashboard", "Logs", "Health", "Setup", "Inventory"]
|
_NAV_ITEMS = ["Dashboard", "Logs", "Health", "Setup", "Inventory", "Notifications", "Share"]
|
||||||
|
|
||||||
|
|
||||||
class MainWindow(QMainWindow):
|
class MainWindow(QMainWindow):
|
||||||
@@ -67,11 +69,16 @@ class MainWindow(QMainWindow):
|
|||||||
self.health_page = HealthPage()
|
self.health_page = HealthPage()
|
||||||
self.setup_page = SetupPage()
|
self.setup_page = SetupPage()
|
||||||
self.inventory_page = InventoryPage()
|
self.inventory_page = InventoryPage()
|
||||||
|
self.notifications_page = NotificationsPage()
|
||||||
|
self.notifications_page.changed.connect(self._apply_alert_settings)
|
||||||
|
self.share_page = SharePage()
|
||||||
self._stack.addWidget(self.dashboard) # 0 Dashboard
|
self._stack.addWidget(self.dashboard) # 0 Dashboard
|
||||||
self._stack.addWidget(self.recorder_page) # 1 Logs
|
self._stack.addWidget(self.recorder_page) # 1 Logs
|
||||||
self._stack.addWidget(self.health_page) # 2 Health
|
self._stack.addWidget(self.health_page) # 2 Health
|
||||||
self._stack.addWidget(self.setup_page) # 3 Setup
|
self._stack.addWidget(self.setup_page) # 3 Setup
|
||||||
self._stack.addWidget(self.inventory_page) # 4 Inventory
|
self._stack.addWidget(self.inventory_page) # 4 Inventory
|
||||||
|
self._stack.addWidget(self.notifications_page) # 5 Notifications
|
||||||
|
self._stack.addWidget(self.share_page) # 6 Share
|
||||||
content_layout.addWidget(self._stack)
|
content_layout.addWidget(self._stack)
|
||||||
|
|
||||||
layout.addWidget(self._build_sidebar())
|
layout.addWidget(self._build_sidebar())
|
||||||
@@ -79,6 +86,15 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
self._worker = SamplerWorker(interval=interval)
|
self._worker = SamplerWorker(interval=interval)
|
||||||
self._worker.sampled.connect(self.dashboard.update_sample)
|
self._worker.sampled.connect(self.dashboard.update_sample)
|
||||||
|
# Desktop alerts (M8): overheat / GPU-lost from the sample stream, new-version below.
|
||||||
|
# Configurable on the Notifications page; gated by AlertMonitor.enabled.
|
||||||
|
self._notified_update_tag = None
|
||||||
|
self._alert_monitor = alerts.AlertMonitor(
|
||||||
|
gpu_temp=float(cfg.get("gpu_temp_alert", 90.0)),
|
||||||
|
cpu_temp=float(cfg.get("cpu_temp_alert", 95.0)),
|
||||||
|
)
|
||||||
|
self._alert_monitor.enabled = bool(cfg.get("alerts_enabled", True))
|
||||||
|
self._worker.sampled.connect(self._alert_monitor.check)
|
||||||
self._worker.start()
|
self._worker.start()
|
||||||
|
|
||||||
# Ask for the password once at launch and collect root-only data (SMART +
|
# Ask for the password once at launch and collect root-only data (SMART +
|
||||||
@@ -216,6 +232,12 @@ class MainWindow(QMainWindow):
|
|||||||
self.health_page._run()
|
self.health_page._run()
|
||||||
self.inventory_page._run()
|
self.inventory_page._run()
|
||||||
|
|
||||||
|
def _apply_alert_settings(self) -> None:
|
||||||
|
cfg = load_config()
|
||||||
|
self._alert_monitor.enabled = bool(cfg.get("alerts_enabled", True))
|
||||||
|
self._alert_monitor.gpu_temp = float(cfg.get("gpu_temp_alert", 90.0))
|
||||||
|
self._alert_monitor.cpu_temp = float(cfg.get("cpu_temp_alert", 95.0))
|
||||||
|
|
||||||
def _manual_check(self) -> None:
|
def _manual_check(self) -> None:
|
||||||
if self._applied:
|
if self._applied:
|
||||||
return
|
return
|
||||||
@@ -279,9 +301,13 @@ class MainWindow(QMainWindow):
|
|||||||
self._update_label.setText(f'<span style="color:{GOOD};">{tag} available</span>')
|
self._update_label.setText(f'<span style="color:{GOOD};">{tag} available</span>')
|
||||||
self._update_btn.setText(f"Update to {tag}")
|
self._update_btn.setText(f"Update to {tag}")
|
||||||
self._update_btn.setVisible(True)
|
self._update_btn.setVisible(True)
|
||||||
|
if self._alert_monitor.enabled and tag != self._notified_update_tag:
|
||||||
|
self._notified_update_tag = tag # once per version, not every poll
|
||||||
|
alerts.notify("Update available", f"RigDoctor {tag} is available — open RigDoctor to update.")
|
||||||
else: # UP_TO_DATE
|
else: # UP_TO_DATE
|
||||||
self._update_label.setText("up-to-date")
|
self._update_label.setText("up-to-date")
|
||||||
|
|
||||||
def closeEvent(self, event) -> None: # noqa: N802 (Qt override)
|
def closeEvent(self, event) -> None: # noqa: N802 (Qt override)
|
||||||
self._worker.stop()
|
self._worker.stop()
|
||||||
|
self.share_page.shutdown()
|
||||||
super().closeEvent(event)
|
super().closeEvent(event)
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
"""Notifications page (M8 config): user-configurable alert settings."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from PySide6.QtCore import Qt, Signal
|
||||||
|
from PySide6.QtWidgets import (
|
||||||
|
QCheckBox,
|
||||||
|
QDoubleSpinBox,
|
||||||
|
QFrame,
|
||||||
|
QGridLayout,
|
||||||
|
QHBoxLayout,
|
||||||
|
QLabel,
|
||||||
|
QPushButton,
|
||||||
|
QVBoxLayout,
|
||||||
|
QWidget,
|
||||||
|
)
|
||||||
|
|
||||||
|
from ..config import load_config, update_config
|
||||||
|
from ..core import alerts
|
||||||
|
|
||||||
|
|
||||||
|
class NotificationsPage(QWidget):
|
||||||
|
changed = Signal() # settings saved — main window re-applies them live
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.setObjectName("Page")
|
||||||
|
root = QVBoxLayout(self)
|
||||||
|
root.setContentsMargins(20, 18, 20, 18)
|
||||||
|
root.setSpacing(16)
|
||||||
|
|
||||||
|
title = QLabel("Notifications")
|
||||||
|
title.setObjectName("PageTitle")
|
||||||
|
root.addWidget(title)
|
||||||
|
|
||||||
|
card = QFrame()
|
||||||
|
card.setObjectName("Card")
|
||||||
|
v = QVBoxLayout(card)
|
||||||
|
v.setContentsMargins(16, 14, 16, 14)
|
||||||
|
v.setSpacing(10)
|
||||||
|
head = QLabel("Alerts")
|
||||||
|
head.setStyleSheet("font-weight: 700; background: transparent;")
|
||||||
|
v.addWidget(head)
|
||||||
|
|
||||||
|
self._enabled = QCheckBox("Enable desktop notifications")
|
||||||
|
v.addWidget(self._enabled)
|
||||||
|
|
||||||
|
grid = QGridLayout()
|
||||||
|
grid.setHorizontalSpacing(12)
|
||||||
|
grid.setColumnStretch(2, 1)
|
||||||
|
self._gpu = self._spin()
|
||||||
|
self._cpu = self._spin()
|
||||||
|
grid.addWidget(QLabel("GPU temperature alert"), 0, 0)
|
||||||
|
grid.addWidget(self._gpu, 0, 1)
|
||||||
|
grid.addWidget(QLabel("CPU temperature alert"), 1, 0)
|
||||||
|
grid.addWidget(self._cpu, 1, 1)
|
||||||
|
v.addLayout(grid)
|
||||||
|
|
||||||
|
note = QLabel("GPU-lost and new-version alerts are included whenever notifications are enabled.")
|
||||||
|
note.setObjectName("Muted")
|
||||||
|
note.setWordWrap(True)
|
||||||
|
v.addWidget(note)
|
||||||
|
|
||||||
|
buttons = QHBoxLayout()
|
||||||
|
save = QPushButton("Save")
|
||||||
|
save.setObjectName("PrimaryButton")
|
||||||
|
save.clicked.connect(self._save)
|
||||||
|
test = QPushButton("Send test")
|
||||||
|
test.clicked.connect(self._test)
|
||||||
|
buttons.addWidget(save)
|
||||||
|
buttons.addWidget(test)
|
||||||
|
buttons.addStretch(1)
|
||||||
|
v.addLayout(buttons)
|
||||||
|
self._status = QLabel("")
|
||||||
|
self._status.setObjectName("Muted")
|
||||||
|
v.addWidget(self._status)
|
||||||
|
|
||||||
|
root.addWidget(card)
|
||||||
|
root.addStretch(1)
|
||||||
|
self._load()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _spin() -> QDoubleSpinBox:
|
||||||
|
spin = QDoubleSpinBox()
|
||||||
|
spin.setRange(40, 110)
|
||||||
|
spin.setDecimals(0)
|
||||||
|
spin.setSingleStep(1)
|
||||||
|
spin.setSuffix(" °C")
|
||||||
|
return spin
|
||||||
|
|
||||||
|
def _load(self) -> None:
|
||||||
|
cfg = load_config()
|
||||||
|
self._enabled.setChecked(bool(cfg.get("alerts_enabled", True)))
|
||||||
|
self._gpu.setValue(float(cfg.get("gpu_temp_alert", 90.0)))
|
||||||
|
self._cpu.setValue(float(cfg.get("cpu_temp_alert", 95.0)))
|
||||||
|
|
||||||
|
def _save(self) -> None:
|
||||||
|
update_config(
|
||||||
|
alerts_enabled=self._enabled.isChecked(),
|
||||||
|
gpu_temp_alert=self._gpu.value(),
|
||||||
|
cpu_temp_alert=self._cpu.value(),
|
||||||
|
)
|
||||||
|
self.changed.emit()
|
||||||
|
self._status.setText("Saved.")
|
||||||
|
|
||||||
|
def _test(self) -> None:
|
||||||
|
ok = alerts.notify("RigDoctor", "Test notification — alerts are working.")
|
||||||
|
self._status.setText("Test notification sent." if ok else "notify-send not found — install libnotify-bin (Setup).")
|
||||||
@@ -86,8 +86,13 @@ class SetupPage(QWidget):
|
|||||||
comp_layout.addLayout(controls)
|
comp_layout.addLayout(controls)
|
||||||
root.addWidget(comp_card)
|
root.addWidget(comp_card)
|
||||||
|
|
||||||
# Update access (M13): token gating updates to Gitea account holders.
|
# Account access (M13/M12): one Gitea token gates updates and session sharing.
|
||||||
upd_card, upd_layout = _panel("Update access")
|
upd_card, upd_layout = _panel("Account access")
|
||||||
|
hint = QLabel("A Gitea access token unlocks updates and session sharing. "
|
||||||
|
"Create it with scopes <b>read:user</b> and <b>read:repository</b>.")
|
||||||
|
hint.setObjectName("Muted")
|
||||||
|
hint.setWordWrap(True)
|
||||||
|
upd_layout.addWidget(hint)
|
||||||
self._upd_status = QLabel("")
|
self._upd_status = QLabel("")
|
||||||
self._upd_status.setObjectName("Muted")
|
self._upd_status.setObjectName("Muted")
|
||||||
self._upd_status.setWordWrap(True)
|
self._upd_status.setWordWrap(True)
|
||||||
@@ -95,7 +100,7 @@ class SetupPage(QWidget):
|
|||||||
token_row = QHBoxLayout()
|
token_row = QHBoxLayout()
|
||||||
self._token_input = QLineEdit()
|
self._token_input = QLineEdit()
|
||||||
self._token_input.setEchoMode(QLineEdit.EchoMode.Password)
|
self._token_input.setEchoMode(QLineEdit.EchoMode.Password)
|
||||||
self._token_input.setPlaceholderText("Paste a Gitea token (scope: read:repository)")
|
self._token_input.setPlaceholderText("Paste a Gitea token (read:user + read:repository)")
|
||||||
save_btn = QPushButton("Save token")
|
save_btn = QPushButton("Save token")
|
||||||
save_btn.setObjectName("PrimaryButton")
|
save_btn.setObjectName("PrimaryButton")
|
||||||
save_btn.clicked.connect(self._save_token)
|
save_btn.clicked.connect(self._save_token)
|
||||||
|
|||||||
@@ -0,0 +1,348 @@
|
|||||||
|
"""Share page (M12): host or join a shared session over the relay.
|
||||||
|
|
||||||
|
Guest sees the host's live sensors + health + inventory (read-only). If the host enables it,
|
||||||
|
a full **PTY terminal** is shared: the guest types and the commands run on the host (as the
|
||||||
|
host's user), the host reads along, and the host can type too — e.g. a sudo password, which
|
||||||
|
stays local and is never sent to the guest.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import base64
|
||||||
|
import json
|
||||||
|
|
||||||
|
from PySide6.QtCore import Qt, QSocketNotifier, QTimer, QUrl
|
||||||
|
from PySide6.QtWebSockets import QWebSocket
|
||||||
|
from PySide6.QtWidgets import (
|
||||||
|
QCheckBox,
|
||||||
|
QFrame,
|
||||||
|
QHBoxLayout,
|
||||||
|
QLabel,
|
||||||
|
QLineEdit,
|
||||||
|
QPushButton,
|
||||||
|
QTextEdit,
|
||||||
|
QVBoxLayout,
|
||||||
|
QWidget,
|
||||||
|
)
|
||||||
|
|
||||||
|
from ..config import load_config, load_token
|
||||||
|
from ..core import share
|
||||||
|
from ..core.pty_session import PtySession
|
||||||
|
from ..core.sampler import Sampler
|
||||||
|
from ..core.sources import available_sources
|
||||||
|
from .terminal_widget import TerminalView
|
||||||
|
|
||||||
|
|
||||||
|
def _relay_url() -> str:
|
||||||
|
return load_config().get("relay_url", "wss://rigdoctor.jesseyvanofferen.com").rstrip("/")
|
||||||
|
|
||||||
|
|
||||||
|
def _b64(data: bytes) -> str:
|
||||||
|
return base64.b64encode(data).decode("ascii")
|
||||||
|
|
||||||
|
|
||||||
|
def _card(title: str) -> tuple[QFrame, QVBoxLayout]:
|
||||||
|
card = QFrame()
|
||||||
|
card.setObjectName("Card")
|
||||||
|
v = QVBoxLayout(card)
|
||||||
|
v.setContentsMargins(16, 14, 16, 14)
|
||||||
|
v.setSpacing(10)
|
||||||
|
head = QLabel(title)
|
||||||
|
head.setStyleSheet("font-weight: 700; background: transparent;")
|
||||||
|
v.addWidget(head)
|
||||||
|
return card, v
|
||||||
|
|
||||||
|
|
||||||
|
class SharePage(QWidget):
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.setObjectName("Page")
|
||||||
|
self._sampler = Sampler(available_sources())
|
||||||
|
self._host_ws: QWebSocket | None = None
|
||||||
|
self._guest_ws: QWebSocket | None = None
|
||||||
|
self._pty: PtySession | None = None
|
||||||
|
self._pty_notifier: QSocketNotifier | None = None
|
||||||
|
self._last_report = None
|
||||||
|
self._last_inv = None
|
||||||
|
self._timer = QTimer(self)
|
||||||
|
self._timer.setInterval(2000)
|
||||||
|
self._timer.timeout.connect(self._stream)
|
||||||
|
|
||||||
|
root = QVBoxLayout(self)
|
||||||
|
root.setContentsMargins(20, 18, 20, 18)
|
||||||
|
root.setSpacing(14)
|
||||||
|
title = QLabel("Share")
|
||||||
|
title.setObjectName("PageTitle")
|
||||||
|
root.addWidget(title)
|
||||||
|
root.addWidget(self._build_host())
|
||||||
|
root.addWidget(self._build_guest(), 1)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------ host
|
||||||
|
def _build_host(self) -> QFrame:
|
||||||
|
card, v = _card("Start a shared session")
|
||||||
|
self._host_status = QLabel("Let someone with an account view your machine, read-only.")
|
||||||
|
self._host_status.setObjectName("Muted")
|
||||||
|
self._host_status.setWordWrap(True)
|
||||||
|
v.addWidget(self._host_status)
|
||||||
|
|
||||||
|
row = QHBoxLayout()
|
||||||
|
self._start_btn = QPushButton("Start shared session")
|
||||||
|
self._start_btn.setObjectName("PrimaryButton")
|
||||||
|
self._start_btn.clicked.connect(self._start_host)
|
||||||
|
self._stop_btn = QPushButton("Stop")
|
||||||
|
self._stop_btn.setEnabled(False)
|
||||||
|
self._stop_btn.clicked.connect(self._stop_host)
|
||||||
|
self._code_label = QLabel("")
|
||||||
|
self._code_label.setStyleSheet("font-weight:700; font-size:18px; color:#38bdf8; background:transparent;")
|
||||||
|
self._code_label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
|
||||||
|
row.addWidget(self._start_btn)
|
||||||
|
row.addWidget(self._stop_btn)
|
||||||
|
row.addSpacing(12)
|
||||||
|
row.addWidget(self._code_label)
|
||||||
|
row.addStretch(1)
|
||||||
|
v.addLayout(row)
|
||||||
|
|
||||||
|
self._allow_term = QCheckBox("Allow remote terminal — the guest runs commands as your user (you read along; you can type too, e.g. a sudo password)")
|
||||||
|
self._allow_term.setStyleSheet("color:#fb923c; background:transparent;")
|
||||||
|
self._allow_term.toggled.connect(self._toggle_terminal)
|
||||||
|
v.addWidget(self._allow_term)
|
||||||
|
|
||||||
|
self._host_term = TerminalView()
|
||||||
|
self._host_term.keys.connect(lambda b: self._pty.write(b) if self._pty else None)
|
||||||
|
self._host_term.resized.connect(lambda r, c: self._pty.set_size(r, c) if self._pty else None)
|
||||||
|
self._host_term.setVisible(False)
|
||||||
|
v.addWidget(self._host_term)
|
||||||
|
return card
|
||||||
|
|
||||||
|
def _start_host(self) -> None:
|
||||||
|
if not load_token():
|
||||||
|
self._host_status.setText("Set a Gitea access token in Setup → Account access first.")
|
||||||
|
return
|
||||||
|
self._host_status.setText("Connecting to the relay…")
|
||||||
|
self._start_btn.setEnabled(False)
|
||||||
|
self._host_ws = QWebSocket()
|
||||||
|
self._host_ws.connected.connect(lambda: self._host_ws.sendTextMessage(json.dumps({"token": load_token()})))
|
||||||
|
self._host_ws.textMessageReceived.connect(self._host_msg)
|
||||||
|
self._host_ws.disconnected.connect(self._host_closed)
|
||||||
|
self._host_ws.errorOccurred.connect(lambda *_: self._host_status.setText(f"Relay error: {self._host_ws.errorString()}"))
|
||||||
|
self._host_ws.open(QUrl(_relay_url() + "/ws/host"))
|
||||||
|
|
||||||
|
def _host_msg(self, text: str) -> None:
|
||||||
|
try:
|
||||||
|
data = json.loads(text)
|
||||||
|
except ValueError:
|
||||||
|
return
|
||||||
|
if data.get("error"):
|
||||||
|
self._host_status.setText(f"Rejected: {data['error']}")
|
||||||
|
return
|
||||||
|
if "code" in data: # relay handshake
|
||||||
|
self._code_label.setText(data["code"])
|
||||||
|
self._host_status.setText(f"Sharing as {data.get('user', '?')} — give this code to whoever should view your machine.")
|
||||||
|
self._stop_btn.setEnabled(True)
|
||||||
|
self._host_ws.sendTextMessage(share.host_full_frame(self._sampler))
|
||||||
|
self._send_terminal_state()
|
||||||
|
if self._allow_term.isChecked():
|
||||||
|
self._start_pty()
|
||||||
|
self._timer.start()
|
||||||
|
return
|
||||||
|
kind = data.get("type") # frames forwarded from a guest
|
||||||
|
if kind == "req_full":
|
||||||
|
# A guest just joined — send a full frame AND the current terminal state, so a
|
||||||
|
# guest that joins *after* the host enabled the terminal still gets access.
|
||||||
|
self._host_ws.sendTextMessage(share.host_full_frame(self._sampler))
|
||||||
|
self._send_terminal_state()
|
||||||
|
elif kind == "pty_in" and self._pty:
|
||||||
|
self._pty.write(base64.b64decode(data["data"]))
|
||||||
|
elif kind == "pty_resize" and self._pty:
|
||||||
|
self._pty.set_size(int(data["rows"]), int(data["cols"]))
|
||||||
|
|
||||||
|
def _toggle_terminal(self, on: bool) -> None:
|
||||||
|
if on and self._host_ws and self._code_label.text():
|
||||||
|
self._start_pty()
|
||||||
|
elif not on:
|
||||||
|
self._stop_pty()
|
||||||
|
self._send_terminal_state()
|
||||||
|
|
||||||
|
def _send_terminal_state(self) -> None:
|
||||||
|
if self._host_ws and self._code_label.text():
|
||||||
|
self._host_ws.sendTextMessage(json.dumps({"type": "terminal", "enabled": self._allow_term.isChecked()}))
|
||||||
|
|
||||||
|
def _start_pty(self) -> None:
|
||||||
|
if self._pty:
|
||||||
|
return
|
||||||
|
rows, cols = self._host_term.grid()
|
||||||
|
self._pty = PtySession(rows=rows, cols=cols)
|
||||||
|
self._pty_notifier = QSocketNotifier(self._pty.master_fd, QSocketNotifier.Type.Read, self)
|
||||||
|
self._pty_notifier.activated.connect(self._on_pty_output)
|
||||||
|
self._host_term.reset()
|
||||||
|
self._host_term.setVisible(True)
|
||||||
|
|
||||||
|
def _on_pty_output(self) -> None:
|
||||||
|
if not self._pty:
|
||||||
|
return
|
||||||
|
data = self._pty.read()
|
||||||
|
if not data: # shell exited / EOF
|
||||||
|
self._stop_pty()
|
||||||
|
self._send_terminal_state()
|
||||||
|
self._allow_term.setChecked(False)
|
||||||
|
return
|
||||||
|
self._host_term.feed(data)
|
||||||
|
if self._host_ws:
|
||||||
|
self._host_ws.sendTextMessage(json.dumps({"type": "pty", "data": _b64(data)}))
|
||||||
|
|
||||||
|
def _stop_pty(self) -> None:
|
||||||
|
if self._pty_notifier:
|
||||||
|
self._pty_notifier.setEnabled(False)
|
||||||
|
self._pty_notifier = None
|
||||||
|
if self._pty:
|
||||||
|
self._pty.close()
|
||||||
|
self._pty = None
|
||||||
|
self._host_term.setVisible(False)
|
||||||
|
|
||||||
|
def _stream(self) -> None:
|
||||||
|
if self._host_ws:
|
||||||
|
self._host_ws.sendTextMessage(share.host_snapshot_frame(self._sampler))
|
||||||
|
|
||||||
|
def _stop_host(self) -> None:
|
||||||
|
self._timer.stop()
|
||||||
|
self._stop_pty()
|
||||||
|
if self._host_ws:
|
||||||
|
self._host_ws.close()
|
||||||
|
self._host_ws = None
|
||||||
|
self._code_label.setText("")
|
||||||
|
self._stop_btn.setEnabled(False)
|
||||||
|
self._start_btn.setEnabled(True)
|
||||||
|
self._host_status.setText("Stopped sharing.")
|
||||||
|
|
||||||
|
def _host_closed(self) -> None:
|
||||||
|
self._timer.stop()
|
||||||
|
self._stop_pty()
|
||||||
|
self._start_btn.setEnabled(True)
|
||||||
|
self._stop_btn.setEnabled(False)
|
||||||
|
if self._code_label.text():
|
||||||
|
self._code_label.setText("")
|
||||||
|
self._host_status.setText("Disconnected from the relay.")
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------- guest
|
||||||
|
def _build_guest(self) -> QFrame:
|
||||||
|
card, v = _card("Join a shared session")
|
||||||
|
row = QHBoxLayout()
|
||||||
|
self._code_input = QLineEdit()
|
||||||
|
self._code_input.setPlaceholderText("Enter share code")
|
||||||
|
self._code_input.setMaxLength(6)
|
||||||
|
self._code_input.setFixedWidth(160)
|
||||||
|
self._join_btn = QPushButton("Join")
|
||||||
|
self._join_btn.setObjectName("PrimaryButton")
|
||||||
|
self._join_btn.clicked.connect(self._join)
|
||||||
|
self._leave_btn = QPushButton("Leave")
|
||||||
|
self._leave_btn.setEnabled(False)
|
||||||
|
self._leave_btn.clicked.connect(self._leave)
|
||||||
|
row.addWidget(self._code_input)
|
||||||
|
row.addWidget(self._join_btn)
|
||||||
|
row.addWidget(self._leave_btn)
|
||||||
|
row.addStretch(1)
|
||||||
|
v.addLayout(row)
|
||||||
|
self._guest_status = QLabel("")
|
||||||
|
self._guest_status.setObjectName("Muted")
|
||||||
|
v.addWidget(self._guest_status)
|
||||||
|
|
||||||
|
self._view = QTextEdit()
|
||||||
|
self._view.setObjectName("Report")
|
||||||
|
self._view.setReadOnly(True)
|
||||||
|
self._view.setVisible(False)
|
||||||
|
self._view.setMinimumHeight(200)
|
||||||
|
v.addWidget(self._view)
|
||||||
|
|
||||||
|
self._term_label = QLabel("")
|
||||||
|
self._term_label.setObjectName("Muted")
|
||||||
|
self._term_label.setVisible(False)
|
||||||
|
v.addWidget(self._term_label)
|
||||||
|
self._guest_term = TerminalView()
|
||||||
|
self._guest_term.keys.connect(self._guest_key)
|
||||||
|
self._guest_term.resized.connect(self._guest_resize)
|
||||||
|
self._guest_term.setVisible(False)
|
||||||
|
v.addWidget(self._guest_term)
|
||||||
|
return card
|
||||||
|
|
||||||
|
def _join(self) -> None:
|
||||||
|
code = self._code_input.text().strip().upper()
|
||||||
|
if not load_token():
|
||||||
|
self._guest_status.setText("Set a Gitea access token in Setup → Account access first.")
|
||||||
|
return
|
||||||
|
if not code:
|
||||||
|
self._guest_status.setText("Enter a share code.")
|
||||||
|
return
|
||||||
|
self._guest_status.setText("Connecting…")
|
||||||
|
self._join_btn.setEnabled(False)
|
||||||
|
self._guest_ws = QWebSocket()
|
||||||
|
self._guest_ws.connected.connect(lambda: self._guest_ws.sendTextMessage(json.dumps({"token": load_token()})))
|
||||||
|
self._guest_ws.textMessageReceived.connect(self._guest_msg)
|
||||||
|
self._guest_ws.disconnected.connect(self._guest_closed)
|
||||||
|
self._guest_ws.errorOccurred.connect(lambda *_: self._guest_status.setText(f"Relay error: {self._guest_ws.errorString()}"))
|
||||||
|
self._guest_ws.open(QUrl(_relay_url() + "/ws/guest/" + code))
|
||||||
|
|
||||||
|
def _guest_msg(self, text: str) -> None:
|
||||||
|
try:
|
||||||
|
data = json.loads(text)
|
||||||
|
except ValueError:
|
||||||
|
return
|
||||||
|
if data.get("error"):
|
||||||
|
self._guest_status.setText(data["error"])
|
||||||
|
return
|
||||||
|
if "joined" in data:
|
||||||
|
self._guest_status.setText(f"Viewing {data.get('host', '?')}'s machine — read-only.")
|
||||||
|
self._leave_btn.setEnabled(True)
|
||||||
|
self._view.setVisible(True)
|
||||||
|
self._guest_ws.sendTextMessage(json.dumps({"type": "req_full"}))
|
||||||
|
return
|
||||||
|
kind = data.get("type")
|
||||||
|
if kind in ("full", "snapshot"):
|
||||||
|
if kind == "full":
|
||||||
|
self._last_report = data.get("report")
|
||||||
|
self._last_inv = data.get("inventory")
|
||||||
|
self._view.setHtml(share.guest_html(data.get("snapshot"), self._last_report, self._last_inv))
|
||||||
|
elif kind == "terminal":
|
||||||
|
self._set_terminal_visible(bool(data.get("enabled")))
|
||||||
|
elif kind == "pty":
|
||||||
|
self._guest_term.feed(base64.b64decode(data["data"]))
|
||||||
|
|
||||||
|
def _set_terminal_visible(self, enabled: bool) -> None:
|
||||||
|
self._term_label.setVisible(True)
|
||||||
|
self._term_label.setText("Terminal enabled by host — your keystrokes run on their machine. Click here and type."
|
||||||
|
if enabled else "Terminal not enabled by the host.")
|
||||||
|
self._guest_term.setVisible(enabled)
|
||||||
|
if enabled:
|
||||||
|
self._guest_term.reset()
|
||||||
|
self._guest_resize(*self._guest_term.grid())
|
||||||
|
self._guest_term.setFocus()
|
||||||
|
|
||||||
|
def _guest_key(self, data: bytes) -> None:
|
||||||
|
if self._guest_ws:
|
||||||
|
self._guest_ws.sendTextMessage(json.dumps({"type": "pty_in", "data": _b64(data)}))
|
||||||
|
|
||||||
|
def _guest_resize(self, rows: int, cols: int) -> None:
|
||||||
|
if self._guest_ws:
|
||||||
|
self._guest_ws.sendTextMessage(json.dumps({"type": "pty_resize", "rows": rows, "cols": cols}))
|
||||||
|
|
||||||
|
def _leave(self) -> None:
|
||||||
|
if self._guest_ws:
|
||||||
|
self._guest_ws.close()
|
||||||
|
self._guest_ws = None
|
||||||
|
for w in (self._view, self._term_label, self._guest_term):
|
||||||
|
w.setVisible(False)
|
||||||
|
self._leave_btn.setEnabled(False)
|
||||||
|
self._join_btn.setEnabled(True)
|
||||||
|
self._guest_status.setText("Left the session.")
|
||||||
|
|
||||||
|
def _guest_closed(self) -> None:
|
||||||
|
self._join_btn.setEnabled(True)
|
||||||
|
self._leave_btn.setEnabled(False)
|
||||||
|
if self._view.isVisible():
|
||||||
|
self._guest_status.setText("Session ended (host disconnected).")
|
||||||
|
|
||||||
|
def shutdown(self) -> None:
|
||||||
|
self._timer.stop()
|
||||||
|
self._stop_pty()
|
||||||
|
for ws in (self._host_ws, self._guest_ws):
|
||||||
|
if ws:
|
||||||
|
ws.close()
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
"""A minimal terminal view: renders PTY output via pyte and emits keystrokes (M12, Tier 3).
|
||||||
|
|
||||||
|
Used by both sides of a shared session — the host (mirrors its local PTY, can also type, e.g.
|
||||||
|
a sudo password) and the guest (renders the streamed PTY, sends keystrokes). Monochrome for
|
||||||
|
now; cursor addressing / layout (vim, top) work via pyte.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import pyte
|
||||||
|
from PySide6.QtCore import Qt, Signal
|
||||||
|
from PySide6.QtGui import QFontDatabase, QFontMetrics, QTextCursor
|
||||||
|
from PySide6.QtWidgets import QPlainTextEdit
|
||||||
|
|
||||||
|
|
||||||
|
class TerminalView(QPlainTextEdit):
|
||||||
|
keys = Signal(bytes) # user keystrokes -> bytes for the PTY
|
||||||
|
resized = Signal(int, int) # rows, cols
|
||||||
|
|
||||||
|
def __init__(self, rows: int = 24, cols: int = 80):
|
||||||
|
super().__init__()
|
||||||
|
self.setLineWrapMode(QPlainTextEdit.LineWrapMode.NoWrap)
|
||||||
|
self.setFont(QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont))
|
||||||
|
self.setUndoRedoEnabled(False)
|
||||||
|
self.setMinimumHeight(260)
|
||||||
|
self._rows, self._cols = rows, cols
|
||||||
|
self._screen = pyte.Screen(cols, rows)
|
||||||
|
self._stream = pyte.ByteStream(self._screen)
|
||||||
|
|
||||||
|
def grid(self) -> tuple[int, int]:
|
||||||
|
return self._rows, self._cols
|
||||||
|
|
||||||
|
def feed(self, data: bytes) -> None:
|
||||||
|
self._stream.feed(data)
|
||||||
|
self._render()
|
||||||
|
|
||||||
|
def reset(self) -> None:
|
||||||
|
self._screen.reset()
|
||||||
|
self._render()
|
||||||
|
|
||||||
|
def _render(self) -> None:
|
||||||
|
self.setPlainText("\n".join(self._screen.display))
|
||||||
|
# Follow the terminal cursor so output (e.g. `ls -la`) stays in view.
|
||||||
|
cursor = self.textCursor()
|
||||||
|
cursor.movePosition(QTextCursor.MoveOperation.Start)
|
||||||
|
cursor.movePosition(QTextCursor.MoveOperation.Down, QTextCursor.MoveMode.MoveAnchor, self._screen.cursor.y)
|
||||||
|
self.setTextCursor(cursor)
|
||||||
|
self.ensureCursorVisible()
|
||||||
|
|
||||||
|
def resizeEvent(self, event): # noqa: N802 (Qt override)
|
||||||
|
super().resizeEvent(event)
|
||||||
|
fm = QFontMetrics(self.font())
|
||||||
|
cw = max(1, fm.horizontalAdvance("M"))
|
||||||
|
ch = max(1, fm.height())
|
||||||
|
cols = max(20, self.viewport().width() // cw)
|
||||||
|
rows = max(6, self.viewport().height() // ch)
|
||||||
|
if (rows, cols) != (self._rows, self._cols):
|
||||||
|
self._rows, self._cols = rows, cols
|
||||||
|
self._screen.resize(rows, cols)
|
||||||
|
self._render()
|
||||||
|
self.resized.emit(rows, cols)
|
||||||
|
|
||||||
|
def keyPressEvent(self, event): # noqa: N802 (Qt override)
|
||||||
|
data = self._translate(event)
|
||||||
|
if data:
|
||||||
|
self.keys.emit(data)
|
||||||
|
event.accept() # display comes from PTY output, not local editing
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _translate(event) -> bytes:
|
||||||
|
key = event.key()
|
||||||
|
mod = event.modifiers()
|
||||||
|
k = Qt.Key
|
||||||
|
if mod & Qt.KeyboardModifier.ControlModifier and k.Key_A.value <= key <= k.Key_Z.value:
|
||||||
|
return bytes([key - k.Key_A.value + 1]) # Ctrl-A..Ctrl-Z
|
||||||
|
special = {
|
||||||
|
k.Key_Return.value: b"\r", k.Key_Enter.value: b"\r",
|
||||||
|
k.Key_Backspace.value: b"\x7f", k.Key_Tab.value: b"\t",
|
||||||
|
k.Key_Escape.value: b"\x1b",
|
||||||
|
k.Key_Up.value: b"\x1b[A", k.Key_Down.value: b"\x1b[B",
|
||||||
|
k.Key_Right.value: b"\x1b[C", k.Key_Left.value: b"\x1b[D",
|
||||||
|
k.Key_Home.value: b"\x1b[H", k.Key_End.value: b"\x1b[F",
|
||||||
|
k.Key_Delete.value: b"\x1b[3~", k.Key_PageUp.value: b"\x1b[5~", k.Key_PageDown.value: b"\x1b[6~",
|
||||||
|
}
|
||||||
|
if key in special:
|
||||||
|
return special[key]
|
||||||
|
text = event.text()
|
||||||
|
return text.encode("utf-8") if text else b""
|
||||||
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
_CHECK = (Path(__file__).parent / "assets" / "check.svg").as_posix()
|
||||||
|
|
||||||
# Palette (dark)
|
# Palette (dark)
|
||||||
BG = "#101216"
|
BG = "#101216"
|
||||||
SIDEBAR = "#15181e"
|
SIDEBAR = "#15181e"
|
||||||
@@ -10,6 +14,7 @@ CARD_BORDER = "#2a2f39"
|
|||||||
TRACK = "#2a2f39"
|
TRACK = "#2a2f39"
|
||||||
TEXT = "#e6e8eb"
|
TEXT = "#e6e8eb"
|
||||||
MUTED = "#8b929c"
|
MUTED = "#8b929c"
|
||||||
|
INPUT_BG = "#0d0f13" # form-control background (must stay dark — see contrast rule)
|
||||||
|
|
||||||
ACCENT = "#38bdf8"
|
ACCENT = "#38bdf8"
|
||||||
COLD = "#7dd3fc" # icey-blue
|
COLD = "#7dd3fc" # icey-blue
|
||||||
@@ -120,8 +125,29 @@ QPushButton#LinkButton {{
|
|||||||
}}
|
}}
|
||||||
QPushButton#LinkButton:hover {{ color: {TEXT}; }}
|
QPushButton#LinkButton:hover {{ color: {TEXT}; }}
|
||||||
|
|
||||||
|
QCheckBox {{ spacing: 8px; background: transparent; }}
|
||||||
|
QCheckBox::indicator {{
|
||||||
|
width: 17px; height: 17px; border-radius: 4px;
|
||||||
|
border: 1px solid {MUTED}; background: #262b34;
|
||||||
|
}}
|
||||||
|
QCheckBox::indicator:hover {{ border-color: {ACCENT}; }}
|
||||||
|
QCheckBox::indicator:checked {{
|
||||||
|
background: {ACCENT}; border-color: {ACCENT}; image: url("{_CHECK}");
|
||||||
|
}}
|
||||||
|
|
||||||
/* Dialogs (update prompt, changelog) — match the dark theme so text is readable. */
|
/* Dialogs (update prompt, changelog) — match the dark theme so text is readable. */
|
||||||
QDialog {{ background: {BG}; }}
|
QDialog {{ background: {BG}; }}
|
||||||
QMessageBox {{ background: {CARD}; }}
|
QMessageBox {{ background: {CARD}; }}
|
||||||
QDialog QLabel, QMessageBox QLabel {{ color: {TEXT}; background: transparent; }}
|
QDialog QLabel, QMessageBox QLabel {{ color: {TEXT}; background: transparent; }}
|
||||||
|
|
||||||
|
/* Form controls: keep dark bg + light text (Fusion defaults to light-on-light here). */
|
||||||
|
QLineEdit, QPlainTextEdit, QAbstractSpinBox, QComboBox {{
|
||||||
|
background: {INPUT_BG}; color: {TEXT};
|
||||||
|
border: 1px solid {CARD_BORDER}; border-radius: 6px; padding: 5px 8px;
|
||||||
|
selection-background-color: {ACCENT}; selection-color: #06222e;
|
||||||
|
}}
|
||||||
|
QLineEdit:focus, QPlainTextEdit:focus, QAbstractSpinBox:focus, QComboBox:focus {{
|
||||||
|
border: 1px solid {ACCENT};
|
||||||
|
}}
|
||||||
|
QLineEdit:disabled, QPlainTextEdit:disabled, QAbstractSpinBox:disabled {{ color: {MUTED}; }}
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
"""Tests for the M8 alert monitor (edge-triggered; notify mocked)."""
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from rigdoctor.core import alerts
|
||||||
|
from rigdoctor.core.sample import Reading, Sample
|
||||||
|
|
||||||
|
|
||||||
|
def _gpu(temp):
|
||||||
|
return Sample(readings=[Reading("gpu", "temp", temp, "°C")])
|
||||||
|
|
||||||
|
|
||||||
|
class AlertTests(unittest.TestCase):
|
||||||
|
@mock.patch.object(alerts, "notify")
|
||||||
|
def test_edge_triggered_no_repeat(self, m):
|
||||||
|
mon = alerts.AlertMonitor(gpu_temp=90.0, cooldown=0.0)
|
||||||
|
mon.check(_gpu(95)) # fires
|
||||||
|
mon.check(_gpu(96)) # still hot — no repeat while active
|
||||||
|
self.assertEqual(m.call_count, 1)
|
||||||
|
mon.check(_gpu(50)) # clears
|
||||||
|
mon.check(_gpu(95)) # hot again — fires
|
||||||
|
self.assertEqual(m.call_count, 2)
|
||||||
|
|
||||||
|
@mock.patch.object(alerts, "notify")
|
||||||
|
def test_no_alert_below_threshold(self, m):
|
||||||
|
alerts.AlertMonitor(gpu_temp=90.0).check(_gpu(70))
|
||||||
|
m.assert_not_called()
|
||||||
|
|
||||||
|
@mock.patch.object(alerts, "notify")
|
||||||
|
def test_gpu_lost(self, m):
|
||||||
|
mon = alerts.AlertMonitor()
|
||||||
|
mon.check(Sample(readings=[Reading("gpu", "status", None, "", "query-timeout")]))
|
||||||
|
m.assert_called_once()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
"""Tests for config save/load (flat TOML writer)."""
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from rigdoctor import config
|
||||||
|
|
||||||
|
|
||||||
|
class ConfigTests(unittest.TestCase):
|
||||||
|
def test_save_load_round_trip(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
cf = Path(d) / "config.toml"
|
||||||
|
with mock.patch.object(config, "CONFIG_FILE", cf), mock.patch.object(config, "CONFIG_DIR", Path(d)):
|
||||||
|
config.save_config({"alerts_enabled": False, "gpu_temp_alert": 88.0, "update_check_minutes": 5})
|
||||||
|
loaded = config.load_config()
|
||||||
|
self.assertIs(loaded["alerts_enabled"], False)
|
||||||
|
self.assertEqual(loaded["gpu_temp_alert"], 88.0)
|
||||||
|
self.assertEqual(loaded["update_check_minutes"], 5)
|
||||||
|
|
||||||
|
def test_update_config_merges_and_keeps_defaults(self):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
cf = Path(d) / "config.toml"
|
||||||
|
with mock.patch.object(config, "CONFIG_FILE", cf), mock.patch.object(config, "CONFIG_DIR", Path(d)):
|
||||||
|
config.update_config(cpu_temp_alert=70.0)
|
||||||
|
self.assertEqual(config.load_config()["cpu_temp_alert"], 70.0)
|
||||||
|
self.assertEqual(config.load_config()["gpu_temp_alert"], 90.0) # default preserved
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
"""Tests for the host PTY session (M12 Tier 3)."""
|
||||||
|
|
||||||
|
import time
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from rigdoctor.core.pty_session import PtySession
|
||||||
|
|
||||||
|
|
||||||
|
class PtySessionTests(unittest.TestCase):
|
||||||
|
def test_runs_command_and_reads_output(self):
|
||||||
|
pty = PtySession(rows=24, cols=80)
|
||||||
|
try:
|
||||||
|
time.sleep(0.4)
|
||||||
|
pty.read() # drain the shell prompt
|
||||||
|
pty.write(b"echo PTY_MARKER_42\n")
|
||||||
|
deadline = time.time() + 3
|
||||||
|
buf = ""
|
||||||
|
while time.time() < deadline and "PTY_MARKER_42" not in buf:
|
||||||
|
time.sleep(0.1)
|
||||||
|
buf += pty.read().decode(errors="replace")
|
||||||
|
self.assertIn("PTY_MARKER_42", buf)
|
||||||
|
finally:
|
||||||
|
pty.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
"""Tests for M12 relay frames + guest HTML rendering (host/guest data shapes)."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from rigdoctor.core import share
|
||||||
|
from rigdoctor.core.sampler import Sampler
|
||||||
|
from rigdoctor.core.sources import available_sources
|
||||||
|
|
||||||
|
|
||||||
|
class RelayFrameTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.sampler = Sampler(available_sources())
|
||||||
|
|
||||||
|
def test_full_frame_shape(self):
|
||||||
|
frame = json.loads(share.host_full_frame(self.sampler))
|
||||||
|
self.assertEqual(frame["type"], "full")
|
||||||
|
self.assertIn("groups", frame["snapshot"])
|
||||||
|
self.assertIsInstance(frame["report"], list)
|
||||||
|
self.assertIsInstance(frame["inventory"], dict)
|
||||||
|
|
||||||
|
def test_snapshot_frame_shape(self):
|
||||||
|
frame = json.loads(share.host_snapshot_frame(self.sampler))
|
||||||
|
self.assertEqual(frame["type"], "snapshot")
|
||||||
|
self.assertIn("groups", frame["snapshot"])
|
||||||
|
|
||||||
|
def test_guest_html_renders(self):
|
||||||
|
snap = {"groups": {"gpu": [{"name": "temp", "value": 51.0, "unit": "°C"}]}}
|
||||||
|
report = [{"severity": "ok", "category": "Logs", "title": "No errors"}]
|
||||||
|
inv = {"System": {"Kernel": "7.0.0"}}
|
||||||
|
html = share.guest_html(snap, report, inv)
|
||||||
|
self.assertIn("51.0 °C", html)
|
||||||
|
self.assertIn("No errors", html)
|
||||||
|
self.assertIn("Kernel", html)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
"""Tests for M12 Tier 2 share server: token gating + endpoints."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import threading
|
||||||
|
import unittest
|
||||||
|
import urllib.error
|
||||||
|
import urllib.request
|
||||||
|
|
||||||
|
from rigdoctor.core import share
|
||||||
|
|
||||||
|
|
||||||
|
class ShareServerTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.srv, self.token = share.make_server("127.0.0.1", 0)
|
||||||
|
self.port = self.srv.server_address[1]
|
||||||
|
self.thread = threading.Thread(target=self.srv.serve_forever, daemon=True)
|
||||||
|
self.thread.start()
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
self.srv.shutdown()
|
||||||
|
|
||||||
|
def _url(self, path, token=None):
|
||||||
|
q = f"?t={token}" if token else ""
|
||||||
|
return f"http://127.0.0.1:{self.port}{path}{q}"
|
||||||
|
|
||||||
|
def test_requires_token(self):
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as cm:
|
||||||
|
urllib.request.urlopen(self._url("/api/snapshot"), timeout=10)
|
||||||
|
self.assertEqual(cm.exception.code, 403)
|
||||||
|
|
||||||
|
def test_bad_token_rejected(self):
|
||||||
|
with self.assertRaises(urllib.error.HTTPError) as cm:
|
||||||
|
urllib.request.urlopen(self._url("/api/snapshot", "wrong"), timeout=10)
|
||||||
|
self.assertEqual(cm.exception.code, 403)
|
||||||
|
|
||||||
|
def test_snapshot_with_token(self):
|
||||||
|
data = json.load(urllib.request.urlopen(self._url("/api/snapshot", self.token), timeout=10))
|
||||||
|
self.assertIn("groups", data)
|
||||||
|
|
||||||
|
def test_page_served(self):
|
||||||
|
body = urllib.request.urlopen(self._url("/", self.token), timeout=10).read()
|
||||||
|
self.assertIn(b"read-only share", body)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user