diff --git a/README.md b/README.md index 9dfb3d1..8f08222 100644 --- a/README.md +++ b/README.md @@ -319,6 +319,22 @@ sudo nginx -t + +🔔 Уведомления и мини-лог VPS + +В панели Hub открой кнопку с логином, блок `Уведомления`, и нажми `Включить`. + +Что пишет Hub: + +- вход в панель: устройство, браузер и IP; +- запуск Hub; +- запуск VPS после перезагрузки; +- короткую причину прошлого выключения/ребута по журналу VPS. + +Важно: если VPS полностью выключился или пропал интернет, сам VPS не сможет отправить уведомление в момент падения. Событие появится после следующего запуска, когда Hub снова поднимется. + + + ✅ Проверка после установки diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index aef5142..56828c9 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -32,6 +32,8 @@ DB_PATH = Path(os.environ.get("OWRT_REMOTE_DB", str(STATE_DIR / "hub.db"))) AUTH_FILE = STATE_DIR / "hub-auth.json" SESSION_TOKEN_FILE = STATE_DIR / "hub-session.token" SESSIONS_FILE = STATE_DIR / "hub-sessions.json" +NOTIFICATIONS_FILE = STATE_DIR / "hub-notifications.json" +BOOT_ID_FILE = STATE_DIR / "hub-boot.id" AGENT_TOKEN_FILE = STATE_DIR / "agent.token" ACME_WEBROOT = STATE_DIR / "acme-webroot" ONLINE_AFTER_SECONDS = int(os.environ.get("OWRT_REMOTE_ONLINE_AFTER", "75")) @@ -47,6 +49,7 @@ SESSION_COOKIE = "owrt_remote_session" ROUTER_COOKIE = "owrt_remote_router" SESSION_TTL_SECONDS = int(os.environ.get("OWRT_REMOTE_SESSION_TTL", str(30 * 24 * 60 * 60))) CAPTCHA_TTL_SECONDS = 600 +NOTIFICATIONS_MAX = 220 LUCI_ABSOLUTE_ROOTS = ("/ubus", "/cgi-bin/luci", "/luci-static") WS_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" SSH_HTTP_SESSIONS = {} @@ -54,6 +57,7 @@ SSH_HTTP_LOCK = threading.Lock() ROUTER_PROXY_LOCK = threading.Lock() ROUTER_PROXY_LIMITERS = {} STATIC_CACHE_LOCK = threading.Lock() +NOTIFICATIONS_LOCK = threading.Lock() STATIC_CACHE = {} STATIC_CACHE_BYTES = 0 @@ -402,6 +406,185 @@ def list_hub_sessions(current_token=""): return rows +def load_notifications(): + ensure_state() + if not NOTIFICATIONS_FILE.exists(): + return [] + try: + data = json.loads(NOTIFICATIONS_FILE.read_text(encoding="utf-8")) + except Exception: + return [] + if isinstance(data, dict): + data = data.get("notifications", []) + if not isinstance(data, list): + return [] + return [item for item in data if isinstance(item, dict)] + + +def save_notifications(items): + items = sorted(items, key=lambda item: int(item.get("ts") or 0), reverse=True)[:NOTIFICATIONS_MAX] + write_json_private(NOTIFICATIONS_FILE, {"notifications": items}) + + +def add_notification(kind, title, body="", level="info", details=None, data=None, dedupe_seconds=0): + ts = now_ts() + title = str(title or "").strip()[:120] + body = str(body or "").strip()[:500] + details = details or [] + if isinstance(details, str): + details = [details] + details = [str(line).strip()[:260] for line in details if str(line).strip()][:12] + item = { + "id": secrets.token_hex(8), + "kind": str(kind or "info")[:40], + "level": str(level or "info")[:20], + "title": title, + "body": body, + "details": details, + "data": data if isinstance(data, dict) else {}, + "ts": ts, + "iso": iso_time(ts), + } + with NOTIFICATIONS_LOCK: + items = load_notifications() + if dedupe_seconds: + for old in items: + if ( + old.get("kind") == item["kind"] + and old.get("title") == item["title"] + and old.get("body") == item["body"] + and ts - int(old.get("ts") or 0) <= int(dedupe_seconds) + ): + return old + items.insert(0, item) + save_notifications(items) + return item + + +def list_notifications(after=0, limit=60): + try: + after = int(after or 0) + except (TypeError, ValueError): + after = 0 + try: + limit = max(1, min(120, int(limit or 60))) + except (TypeError, ValueError): + limit = 60 + items = [item for item in load_notifications() if int(item.get("ts") or 0) > after] + return sorted(items, key=lambda item: int(item.get("ts") or 0), reverse=True)[:limit] + + +def run_quiet(args, timeout=2.5): + try: + return subprocess.run( + args, + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, + text=True, + timeout=timeout, + check=False, + ).stdout.strip() + except Exception: + return "" + + +def current_boot_id(): + try: + return Path("/proc/sys/kernel/random/boot_id").read_text(encoding="utf-8").strip() + except OSError: + return "" + + +def previous_boot_reason(): + journal = run_quiet(["journalctl", "-b", "-1", "-n", "180", "--no-pager", "-o", "short-iso"], timeout=3.0) + last_log = run_quiet(["last", "-x", "-n", "8", "reboot", "shutdown"], timeout=2.0) + text = "\n".join([journal, last_log]).lower() + reason = "причина не найдена в журнале" + if any(word in text for word in ("out of memory", "oom-killer", "killed process", "memory cgroup out of memory")): + reason = "похоже на нехватку памяти / OOM" + elif any(word in text for word in ("kernel panic", "panic:")): + reason = "похоже на kernel panic" + elif any(word in text for word in ("watchdog", "hard lockup", "soft lockup")): + reason = "похоже на watchdog/зависание" + elif any(word in text for word in ("power key", "poweroff", "powering off")): + reason = "похоже на выключение питания" + elif any(word in text for word in ("the system will reboot now", "system reboot", "reboot.target", "systemd-reboot")): + reason = "штатная перезагрузка командой reboot/systemctl" + elif "shutdown" in text: + reason = "штатное выключение/shutdown" + + details = [] + for line in (journal + "\n" + last_log).splitlines(): + low = line.lower() + if any( + marker in low + for marker in ( + "reboot", + "shutdown", + "panic", + "oom", + "out of memory", + "watchdog", + "power", + "killed process", + "systemd-logind", + "systemd-reboot", + ) + ): + details.append(" ".join(line.split())) + if len(details) >= 8: + break + return reason, details + + +def record_hub_start_event(): + ensure_state() + boot_id = current_boot_id() + previous_boot_id = "" + try: + previous_boot_id = BOOT_ID_FILE.read_text(encoding="utf-8").strip() + except OSError: + pass + if boot_id: + try: + BOOT_ID_FILE.write_text(boot_id + "\n", encoding="utf-8") + os.chmod(BOOT_ID_FILE, 0o600) + except OSError: + pass + + if previous_boot_id and boot_id and previous_boot_id != boot_id: + reason, details = previous_boot_reason() + add_notification( + "vps_up", + "VPS снова онлайн", + f"Hub запущен после перезагрузки. Причина: {reason}.", + "warn", + details, + {"boot_id": boot_id}, + dedupe_seconds=60, + ) + elif previous_boot_id: + add_notification( + "hub_restart", + "Hub перезапущен", + "Служба OpenWrt Remote Hub снова запущена.", + "info", + [], + {"boot_id": boot_id}, + dedupe_seconds=45, + ) + else: + add_notification( + "hub_start", + "Hub запущен", + "OpenWrt Remote Hub стартовал первый раз на этом VPS.", + "info", + [], + {"boot_id": boot_id}, + dedupe_seconds=60, + ) + + def captcha_challenge(): code = str(secrets.randbelow(9000) + 1000) issued = str(now_ts()) @@ -1080,9 +1263,10 @@ def parse_resize_payload(payload): return message.get("rows"), message.get("cols") -def dashboard_html(routers, username, sessions=None): +def dashboard_html(routers, username, sessions=None, notifications=None): routers_json = json.dumps(routers, ensure_ascii=False) sessions_json = json.dumps(sessions or [], ensure_ascii=False) + notifications_json = json.dumps(notifications or [], ensure_ascii=False) safe_username = html.escape(username, quote=True) return f""" @@ -1102,6 +1286,7 @@ h1{{margin:0;font-size:29px;line-height:1.2;letter-spacing:0}}.appBanner{{positi .toolbar{{display:grid;grid-template-columns:1fr 1fr 110px 110px 150px auto;gap:10px;margin:18px 0;padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;box-shadow:0 18px 46px rgba(0,0,0,.20);backdrop-filter:blur(10px)}}.toolbar input,.toolbar select{{background:rgba(255,255,255,.08);border-color:var(--line);color:#f3e8ff;box-shadow:inset 0 1px 0 rgba(255,255,255,.05)}}.toolbar input::placeholder{{color:#b9adc9}} .authMenu{{position:absolute;right:0;top:calc(100% + 10px);z-index:5;width:min(520px,calc(100vw - 44px));padding:14px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.05)),rgba(19,14,32,.96);border:1px solid var(--line);border-radius:8px;box-shadow:0 24px 70px rgba(0,0,0,.36);backdrop-filter:blur(12px)}}.authMenu[hidden]{{display:none}}.authMenu h2{{margin:0 0 4px;font-size:18px}}.authMenu p{{margin:0 0 12px;color:var(--muted)}}.authGrid{{display:grid;grid-template-columns:1fr 1fr;gap:10px}}.authGrid .wide{{grid-column:1/-1}}.msg{{margin-top:10px;color:#bbf7d0;font-weight:750}}.msg.bad{{color:#fecdd3}}.formMsg{{margin:-8px 0 18px;padding:10px 12px;border:1px solid rgba(34,197,94,.34);border-radius:8px;background:rgba(34,197,94,.12);color:#bbf7d0;font-weight:800}}.formMsg.bad{{border-color:rgba(251,113,133,.4);background:rgba(251,113,133,.13);color:#fecdd3}} .sessionBox{{margin-top:14px;padding-top:12px;border-top:1px solid var(--line)}}.sessionHead{{display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:8px}}.sessionHead h3{{margin:0;font-size:15px}}.sessionList{{display:grid;gap:8px;max-height:260px;overflow:auto;padding-right:2px}}.sessionRow{{display:grid;grid-template-columns:1fr auto;gap:8px;align-items:center;border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px;text-align:left}}.sessionTitle{{display:flex;gap:7px;align-items:center;flex-wrap:wrap;font-weight:900}}.sessionMeta{{margin-top:3px;color:var(--muted);font-size:12px;line-height:1.35;word-break:break-word}}.sessionCurrent{{border:1px solid rgba(34,197,94,.38);border-radius:999px;padding:2px 7px;color:#bbf7d0;background:rgba(34,197,94,.13);font-size:11px}}.sessionBtn{{padding:7px 9px;font-size:12px;border-radius:999px}}.sessionEmpty{{padding:10px;border:1px dashed var(--line);border-radius:8px;color:var(--muted);text-align:center}} +.notifyBox{{margin-top:14px;padding-top:12px;border-top:1px solid var(--line)}}.notifyHint{{margin:-4px 0 10px;color:var(--muted);font-size:12px;line-height:1.35}}.notifyList{{display:grid;gap:8px;max-height:260px;overflow:auto;padding-right:2px}}.notifyRow{{border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px;text-align:left}}.notifyTitle{{display:flex;align-items:center;justify-content:space-between;gap:8px;font-weight:950}}.notifyTitle span:first-child{{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.notifyTime{{color:var(--muted);font-size:11px;font-weight:750;white-space:nowrap}}.notifyBody{{margin-top:4px;color:#ddd6fe;font-size:12px;line-height:1.35;word-break:break-word}}.notifyDetails{{margin:7px 0 0;padding:8px;border:1px solid rgba(255,255,255,.08);border-radius:7px;background:rgba(0,0,0,.18);color:#c4b5fd;font:11px/1.35 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre-wrap;max-height:92px;overflow:auto}}.notifyRow.warn{{border-color:rgba(245,158,11,.34);background:rgba(245,158,11,.08)}}.notifyRow.bad{{border-color:rgba(251,113,133,.38);background:rgba(251,113,133,.09)}}.notifyBtn.on{{border-color:rgba(34,197,94,.36);background:rgba(34,197,94,.15);color:#bbf7d0}} input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding:10px 11px;background:rgba(8,5,18,.72);color:var(--text)}}button,.btn{{border:1px solid rgba(255,255,255,.10);border-radius:8px;padding:10px 13px;background:rgba(255,255,255,.10);color:#f7f2ff;font-weight:850;text-decoration:none;cursor:pointer;display:inline-flex;justify-content:center;align-items:center}}.authToggle{{border-radius:999px;padding:8px 14px;background:rgba(255,255,255,.08);color:#f3e8ff}}button.primary,.btn.primary{{background:var(--blue);color:#fff;box-shadow:0 10px 22px rgba(124,58,237,.22)}}button.bad,.btn.bad{{background:rgba(251,113,133,.16);color:#fecdd3}}.btn.good{{background:rgba(34,197,94,.16);color:#bbf7d0}}.btn.disabled{{opacity:.45;cursor:not-allowed}} .summary{{display:flex;gap:10px;flex-wrap:wrap;justify-content:flex-end}}.miniStat{{display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;min-width:132px;border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.07);padding:8px 12px;color:#ddd6fe;font-weight:800;font-size:13px;line-height:1;white-space:nowrap}} .cards{{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:14px}}.card{{position:relative;min-height:246px;overflow:hidden;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);border:1px solid var(--line);border-radius:8px;padding:14px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}}.card::before{{content:"";position:absolute;inset:0 0 auto 0;height:3px;background:var(--green)}}.card.online{{border-color:rgba(34,197,94,.45);box-shadow:0 18px 46px rgba(0,0,0,.28),0 0 0 1px rgba(34,197,94,.10),0 0 34px rgba(34,197,94,.10)}}.card.off{{border-color:rgba(251,113,133,.42);box-shadow:0 18px 46px rgba(0,0,0,.28),0 0 0 1px rgba(251,113,133,.08),0 0 30px rgba(251,113,133,.08)}}.card.off::before{{background:var(--red)}}.card.warn::before{{background:var(--amber)}}.card.main{{grid-column:span 2}} @@ -1154,6 +1339,14 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding + + + Уведомления + Включить + + Входы в панель и запуск VPS/Hub. Если VPS полностью выключен, событие отключения появится после следующего запуска. + + @@ -1173,6 +1366,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding