@@ -1167,7 +1364,8 @@
const methods = [
"getState","connect","disconnect","connectProfile","saveProfile","createProfile",
"selectProfile","deleteProfile","installCore","openURL","pingServers","pingBest",
- "checkUpdate","applyUpdate","saveHy2","importSubscription","saveRemnawave","importRemnawave","provisionUser","quit"
+ "checkUpdate","applyUpdate","saveHy2","importSubscription","saveRemnawave","importRemnawave",
+ "provisionUser","renewAccount","setMode","getLogs","quit"
];
if (typeof window.getState === "function") return;
window.__navisHttp = true;
@@ -1208,17 +1406,44 @@
const autoBest = $("autoBest");
const serverList = $("serverList");
const updCheckBtn = $("updCheckBtn");
+ const aboutUpdBtn = $("aboutUpdBtn");
const updateBanner = $("updateBanner");
const updateBtn = $("updateBtn");
const skipUpdateBtn = $("skipUpdateBtn");
const verLabel = $("verLabel");
const badgeVer = $("badgeVer");
+ const aboutVer = $("aboutVer");
const storeUpdateNote = $("storeUpdateNote");
const themeToggle = $("themeToggle");
+ const themeSwitch = $("themeSwitch");
+ const renewBtn = $("renewBtn");
+ const accountBox = $("accountBox");
+ const modeProxyBtn = $("modeProxyBtn");
+ const modeVpnBtn = $("modeVpnBtn");
+ const modeSection = $("modeSection");
+ const vpnChip = $("vpnChip");
+ const logView = $("logView");
+ const logsRefreshBtn = $("logsRefreshBtn");
+ const logsClearBtn = $("logsClearBtn");
const THEME_KEY = "navis.theme";
const SKIP_UPDATE_KEY = "navis.skipUpdateVersion";
let storePackaged = false;
+ let currentMode = "proxy";
+ let currentPage = "home";
+ // ==== Navigation ====
+ document.querySelectorAll(".nav-btn").forEach((b) => {
+ b.addEventListener("click", () => showPage(b.dataset.page));
+ });
+ function showPage(name) {
+ currentPage = name;
+ document.querySelectorAll(".nav-btn").forEach((b) => b.classList.toggle("active", b.dataset.page === name));
+ document.querySelectorAll(".page").forEach((p) => p.classList.toggle("active", p.dataset.page === name));
+ if (name === "logs") refreshLogs().catch(() => {});
+ }
+ $("curServer").addEventListener("click", () => showPage("profiles"));
+
+ // ==== Theme ====
function readTheme() {
try {
const t = localStorage.getItem(THEME_KEY);
@@ -1238,6 +1463,7 @@
themeToggle.title = theme === "dark" ? "Светлая тема" : "Тёмная тема";
themeToggle.setAttribute("aria-label", themeToggle.title);
}
+ if (themeSwitch) themeSwitch.checked = theme === "dark";
}
applyTheme(document.documentElement.getAttribute("data-theme") || readTheme());
if (themeToggle) {
@@ -1246,6 +1472,9 @@
applyTheme(cur === "dark" ? "light" : "dark");
});
}
+ if (themeSwitch) {
+ themeSwitch.addEventListener("change", () => applyTheme(themeSwitch.checked ? "dark" : "light"));
+ }
function skippedVersion() {
try { return localStorage.getItem(SKIP_UPDATE_KEY) || ""; } catch (_) { return ""; }
@@ -1400,6 +1629,7 @@
const want = active || cur || (profiles[0] && profiles[0].name);
if (want) profile.value = want;
renderServerList(want);
+ renderCurServer(want);
}
function orderedProfiles() {
@@ -1414,6 +1644,36 @@
return list;
}
+ function renderCurServer(activeName) {
+ const p = profiles.find((x) => x.name === (activeName || profile.value));
+ if (!p) {
+ $("curFlag").textContent = "·";
+ $("curName").textContent = "Нет сервера";
+ $("curHost").textContent = "добавьте профиль или подписку";
+ $("curProto").textContent = "—";
+ $("curPing").textContent = "…";
+ $("curPing").className = "ms";
+ return;
+ }
+ $("curFlag").textContent = p.flag || (p.country || "·");
+ $("curName").textContent = p.name;
+ $("curHost").textContent = p.host || "нет хоста";
+ $("curProto").textContent = (p.protocol || "?").toString();
+ const pr = pingMap[p.name];
+ const el = $("curPing");
+ if (pr && pr.ok) {
+ el.className = "ms " + msClass(pr.ms, true);
+ el.textContent = pr.ms + " ms";
+ } else if (pr && pr.error) {
+ el.className = "ms bad";
+ el.textContent = "—";
+ el.title = pr.error;
+ } else {
+ el.className = "ms";
+ el.textContent = "…";
+ }
+ }
+
function renderServerList(activeName) {
const active = activeName || profile.value;
serverList.innerHTML = "";
@@ -1514,6 +1774,64 @@
return (mb >= 1 ? Math.round(mb) : 1) + " МБ";
}
+ function fmtDate(unix) {
+ const d = new Date(unix * 1000);
+ try {
+ return d.toLocaleDateString("ru-RU", { day: "numeric", month: "long", year: "numeric" });
+ } catch (_) {
+ return d.toISOString().slice(0, 10);
+ }
+ }
+
+ function renderAccount(acc, subInfo) {
+ if (!accountBox) return;
+ if (!acc) {
+ accountBox.hidden = true;
+ return;
+ }
+ accountBox.hidden = false;
+ $("accName").textContent = acc.username || "—";
+
+ const expRow = $("accExpireRow");
+ if (acc.expire_at) {
+ expRow.hidden = false;
+ const daysLeft = Math.floor((acc.expire_at * 1000 - Date.now()) / 86400000);
+ const el = $("accExpire");
+ if (daysLeft < 0) {
+ el.textContent = fmtDate(acc.expire_at) + " · истёк";
+ el.classList.add("warn");
+ } else {
+ el.textContent = fmtDate(acc.expire_at) + " · осталось " + daysLeft + " дн.";
+ el.classList.toggle("warn", daysLeft <= 3);
+ }
+ } else {
+ expRow.hidden = true;
+ }
+
+ const trafRow = $("accTrafficRow");
+ const limit = acc.traffic_limit_bytes || 0;
+ const used = subInfo ? ((subInfo.upload || 0) + (subInfo.download || 0)) : 0;
+ if (limit > 0 || used > 0) {
+ trafRow.hidden = false;
+ $("accTraffic").textContent = limit > 0
+ ? (fmtTraffic(used) + " из " + fmtTraffic(limit))
+ : (fmtTraffic(used) + " · Безлимит");
+ } else {
+ trafRow.hidden = true;
+ }
+ }
+
+ function renderMode(state) {
+ currentMode = state.mode === "vpn" ? "vpn" : "proxy";
+ if (modeSection) {
+ // Не показываем фейковый переключатель там, где VPN-режима нет (macOS).
+ modeSection.hidden = !state.vpn_mode_supported;
+ }
+ if (modeProxyBtn) modeProxyBtn.classList.toggle("active", currentMode === "proxy");
+ if (modeVpnBtn) modeVpnBtn.classList.toggle("active", currentMode === "vpn");
+ if (vpnChip) vpnChip.hidden = !state.vpn_active;
+ }
+
function renderSubInfo(info) {
const card = $("subInfoCard");
if (!card) return;
@@ -1530,12 +1848,7 @@
expireRow.hidden = !hasExpire;
if (hasExpire) {
const d = new Date(info.expire * 1000);
- let text = "";
- try {
- text = d.toLocaleDateString("ru-RU", { day: "numeric", month: "long", year: "numeric" });
- } catch (_) {
- text = d.toISOString().slice(0, 10);
- }
+ const text = fmtDate(info.expire);
const daysLeft = Math.floor((d.getTime() - Date.now()) / 86400000);
const v = $("subExpireVal");
if (daysLeft < 0) {
@@ -1565,6 +1878,7 @@
function renderUpdate(u, version) {
const label = "Navis v" + (version || "?");
verLabel.textContent = label;
+ if (aboutVer) aboutVer.textContent = "Версия " + (version || "?");
if (badgeVer && version) {
const short = String(version).split("+")[0];
badgeVer.textContent = short || version;
@@ -1572,10 +1886,12 @@
if (storePackaged || (u && u.store_managed)) {
updateBanner.classList.remove("show");
if (updCheckBtn) updCheckBtn.hidden = true;
+ if (aboutUpdBtn) aboutUpdBtn.hidden = true;
if (storeUpdateNote) storeUpdateNote.hidden = false;
return;
}
if (updCheckBtn) updCheckBtn.hidden = false;
+ if (aboutUpdBtn) aboutUpdBtn.hidden = false;
if (storeUpdateNote) storeUpdateNote.hidden = true;
if (!u) {
updateBanner.classList.remove("show");
@@ -1603,11 +1919,11 @@
connected = !!state.connected;
dot.classList.toggle("on", connected);
hero.classList.toggle("on", connected);
+ btn.classList.toggle("on", connected);
statusText.textContent = connected
? ("Подключено" + (state.profile ? " · " + state.profile : ""))
: "Отключено";
- btn.textContent = connected ? "Отключить" : "Подключить";
- btn.classList.toggle("danger", connected);
+ btn.title = connected ? "Отключить" : "Подключить";
const lock = connected || busy;
proxy.disabled = lock;
@@ -1621,6 +1937,7 @@
pingBtn.disabled = busy;
bestBtn.disabled = busy;
updCheckBtn.disabled = busy;
+ if (aboutUpdBtn) aboutUpdBtn.disabled = busy;
updateBtn.disabled = busy;
subBtn.disabled = busy;
subUrl.disabled = busy;
@@ -1630,15 +1947,21 @@
if (rwCaddy) rwCaddy.disabled = busy;
if (rwSaveBtn) rwSaveBtn.disabled = busy;
if (rwSyncBtn) rwSyncBtn.disabled = busy;
- if (provisionBox) provisionBox.hidden = !state.provision_ready;
+ // Выдать доступ — только пока аккаунт НЕ привязан (второй не создаём).
+ if (provisionBox) provisionBox.hidden = !state.provision_ready || !!state.account;
if (provUser) provUser.disabled = busy;
if (provBtn) provBtn.disabled = busy;
+ if (renewBtn) renewBtn.disabled = busy || !state.provision_ready;
+ if (modeProxyBtn) modeProxyBtn.disabled = busy || connected;
+ if (modeVpnBtn) modeVpnBtn.disabled = busy || connected;
btn.disabled = busy;
rememberPings(state.pings || []);
fillProfiles(state.profiles || [], state.active_profile || state.profile);
renderUpdate(state.update, state.version);
renderSubInfo(state.sub_info);
+ renderAccount(state.account, state.sub_info);
+ renderMode(state);
if (typeof state.subscription_url === "string" && !dirty) {
subUrl.value = state.subscription_url;
}
@@ -1669,17 +1992,20 @@
let detail = "";
if (connected) {
const parts = [];
+ if (state.vpn_active) parts.push("VPN: весь трафик через туннель");
if (state.http_proxy) parts.push("HTTP " + state.http_proxy);
if (state.socks_proxy) parts.push("SOCKS " + state.socks_proxy);
detail = parts.join(" · ") || "Туннель активен";
heroHint.textContent = detail;
} else if (state.core_ready === false) {
- detail = "Сначала установите cores в разделе «Сервис»";
+ detail = "Сначала установите cores в Настройках («Сервис»)";
heroHint.textContent = "Нужны cores для выбранного протокола";
} else {
const n = (state.profiles || []).length;
- detail = n > 1 ? ("Серверов: " + n + " · нажмите Пинг или Лучший") : "Готово к подключению";
- heroHint.textContent = n > 1 ? "Клик — выбрать, двойной клик — подключить" : "Выберите сервер и нажмите Подключить";
+ detail = n > 1 ? ("Серверов: " + n + " · Профили → Пинг / Лучший") : "Готово к подключению";
+ heroHint.textContent = currentMode === "vpn"
+ ? "Режим VPN: весь трафик, включая игры и приложения"
+ : "Режим прокси: браузеры и приложения через прокси";
}
if (!busy && Date.now() > metaHoldUntil) {
setMeta(detail, state.core_ready === false ? "err" : "");
@@ -1711,7 +2037,9 @@
}
function paintButtonsLocked(locked) {
- [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, bestBtn, updCheckBtn, updateBtn, skipUpdateBtn, subBtn, subUrl, rwBase, rwShort, rwToken, rwCaddy, rwSaveBtn, rwSyncBtn, provUser, provBtn].forEach((b) => {
+ [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, bestBtn, updCheckBtn, aboutUpdBtn,
+ updateBtn, skipUpdateBtn, subBtn, subUrl, rwBase, rwShort, rwToken, rwCaddy, rwSaveBtn, rwSyncBtn,
+ provUser, provBtn, renewBtn, modeProxyBtn, modeVpnBtn, logsRefreshBtn].forEach((b) => {
if (b) b.disabled = locked;
});
}
@@ -1721,6 +2049,7 @@
const res = await pingBest(!!autoConnect);
rememberPings(res.pings || []);
renderServerList(res.best_name || profile.value);
+ renderCurServer(res.best_name || profile.value);
if (res.best_name) {
setMeta("Лучший: " + res.best_name + " · " + res.best_ms + " ms" + (res.connected ? " · подключено" : ""), "ok");
}
@@ -1913,12 +2242,56 @@
});
}
+ if (renewBtn) {
+ renewBtn.addEventListener("click", () => withBusy(async () => {
+ try {
+ setMeta("Продление тарифа (50 ГБ / +30 дней)…");
+ const r = await renewAccount();
+ formHydrated = false;
+ dirty = false;
+ let msg = "Продлено: " + r.username;
+ if (r.traffic_limit_bytes > 0) msg += " · " + fmtTraffic(r.traffic_limit_bytes);
+ if (r.expire_at) {
+ try { msg += " · до " + new Date(r.expire_at * 1000).toLocaleDateString("ru-RU"); } catch (_) {}
+ }
+ setMeta(msg, "ok");
+ } catch (e) { setMeta(String(e), "err"); }
+ }));
+ }
+
+ async function switchMode(mode) {
+ if (mode === currentMode) return;
+ await withBusy(async () => {
+ try {
+ await setMode(mode);
+ setMeta(mode === "vpn"
+ ? "Режим VPN включён: весь трафик пойдёт через туннель после подключения"
+ : "Режим прокси включён", "ok");
+ } catch (e) { setMeta(String(e), "err"); }
+ });
+ }
+ if (modeProxyBtn) modeProxyBtn.addEventListener("click", () => switchMode("proxy"));
+ if (modeVpnBtn) modeVpnBtn.addEventListener("click", () => switchMode("vpn"));
+
+ async function refreshLogs() {
+ try {
+ const text = await getLogs();
+ logView.textContent = (text && text.trim()) ? text : "Пусто — подключитесь, чтобы увидеть логи ядра.";
+ logView.scrollTop = logView.scrollHeight;
+ } catch (e) {
+ logView.textContent = "Не удалось получить логи: " + String(e);
+ }
+ }
+ if (logsRefreshBtn) logsRefreshBtn.addEventListener("click", () => refreshLogs());
+ if (logsClearBtn) logsClearBtn.addEventListener("click", () => { logView.textContent = ""; });
+
pingBtn.addEventListener("click", () => withBusy(async () => {
try {
setMeta("Пинг серверов…");
const rows = await pingServers();
rememberPings(rows);
renderServerList(profile.value);
+ renderCurServer(profile.value);
const ok = (rows || []).filter((r) => r.ok).length;
setMeta("Пинг: " + ok + "/" + (rows || []).length + " доступны", ok ? "ok" : "err");
} catch (e) { setMeta(String(e), "err"); }
@@ -1930,7 +2303,7 @@
} catch (e) { setMeta(String(e), "err"); }
}));
- updCheckBtn.addEventListener("click", () => withBusy(async () => {
+ async function runUpdateCheck() {
try {
setMeta("Проверка обновлений…");
const st = await checkUpdate();
@@ -1939,7 +2312,9 @@
else if (st.error) setMeta("Обновление: " + st.error, "err");
else setMeta("У вас актуальная версия " + st.current, "ok");
} catch (e) { setMeta(String(e), "err"); }
- }));
+ }
+ updCheckBtn.addEventListener("click", () => withBusy(runUpdateCheck));
+ if (aboutUpdBtn) aboutUpdBtn.addEventListener("click", () => withBusy(runUpdateCheck));
updateBtn.addEventListener("click", () => withBusy(async () => {
try {
@@ -1966,7 +2341,11 @@
setMeta(String(e), "err");
}
})();
- setInterval(() => { if (!busy && !modal.classList.contains("open")) refresh().catch(() => {}); }, 2500);
+ setInterval(() => {
+ if (busy || modal.classList.contains("open")) return;
+ refresh().catch(() => {});
+ if (currentPage === "logs") refreshLogs().catch(() => {});
+ }, 2500);