@@ -705,15 +850,11 @@
- Сервис · пинг, cores, обновления
+ Сервис · cores, обновления
-
+
-
-
-
-
Загрузка…
@@ -765,10 +906,12 @@
const shopBtn = $("shopBtn");
const shopLink = $("shopLink");
const pingBtn = $("pingBtn");
+ const bestBtn = $("bestBtn");
+ const autoBest = $("autoBest");
+ const serverList = $("serverList");
const updCheckBtn = $("updCheckBtn");
const updateBanner = $("updateBanner");
const updateBtn = $("updateBtn");
- const pingList = $("pingList");
const verLabel = $("verLabel");
const subUrl = $("subUrl");
const subBtn = $("subBtn");
@@ -776,6 +919,16 @@
const protoChip = $("protoChip");
const heroHint = $("heroHint");
const SHOP_URL = "https://evilfox.win/";
+ const AUTO_BEST_KEY = "navis.autoBest";
+
+ try {
+ const saved = localStorage.getItem(AUTO_BEST_KEY);
+ if (saved === "0") autoBest.checked = false;
+ if (saved === "1") autoBest.checked = true;
+ } catch (_) {}
+ autoBest.addEventListener("change", () => {
+ try { localStorage.setItem(AUTO_BEST_KEY, autoBest.checked ? "1" : "0"); } catch (_) {}
+ });
function readHy2() {
return {
@@ -823,6 +976,7 @@
let formHydrated = false;
let dirty = false;
let profiles = [];
+ let pingMap = {};
let metaHoldUntil = 0;
function markDirty() { dirty = true; }
@@ -858,6 +1012,19 @@
return "протокол";
}
+ function msClass(ms, ok) {
+ if (!ok) return "bad";
+ if (ms < 80) return "good";
+ if (ms < 180) return "ok";
+ if (ms < 350) return "mid";
+ return "bad";
+ }
+
+ function rememberPings(pings) {
+ pingMap = {};
+ (pings || []).forEach((p) => { pingMap[p.name] = p; });
+ }
+
function fillProfiles(list, active) {
profiles = list || [];
const cur = profile.value;
@@ -865,31 +1032,103 @@
profiles.forEach((p) => {
const opt = document.createElement("option");
opt.value = p.name;
- const proto = p.protocol ? String(p.protocol).toUpperCase() : "";
- opt.textContent = (proto ? (proto + " · ") : "") + (p.host ? (p.name + " · " + p.host) : p.name);
+ opt.textContent = p.name;
profile.appendChild(opt);
});
const want = active || cur || (profiles[0] && profiles[0].name);
if (want) profile.value = want;
+ renderServerList(want);
}
- function renderPings(pings) {
- pingList.innerHTML = "";
- (pings || []).forEach((p) => {
- const row = document.createElement("div");
- row.className = "ping-item";
- const left = document.createElement("span");
- left.textContent = p.host ? (p.name + " · " + p.host) : p.name;
- const right = document.createElement("span");
- right.className = "ms " + (p.ok ? "ok" : "bad");
- right.textContent = p.ok ? (p.ms + " ms") : (p.error || "ошибка");
+ function orderedProfiles() {
+ const list = profiles.slice();
+ list.sort((a, b) => {
+ const pa = pingMap[a.name], pb = pingMap[b.name];
+ const oa = pa && pa.ok, ob = pb && pb.ok;
+ if (oa !== ob) return oa ? -1 : 1;
+ if (oa && ob && pa.ms !== pb.ms) return pa.ms - pb.ms;
+ return String(a.name).localeCompare(String(b.name));
+ });
+ return list;
+ }
+
+ function renderServerList(activeName) {
+ const active = activeName || profile.value;
+ serverList.innerHTML = "";
+ const list = orderedProfiles();
+ if (!list.length) {
+ const empty = document.createElement("div");
+ empty.className = "server-empty";
+ empty.textContent = "Нет серверов — добавьте профиль или подписку";
+ serverList.appendChild(empty);
+ return;
+ }
+ list.forEach((p) => {
+ const row = document.createElement("button");
+ row.type = "button";
+ row.className = "server-row" + (p.name === active ? " active" : "");
+ row.dataset.name = p.name;
+
+ const left = document.createElement("div");
+ left.className = "left";
+ const nameEl = document.createElement("div");
+ nameEl.className = "name";
+ nameEl.textContent = p.name;
+ const sub = document.createElement("div");
+ sub.className = "sub";
+ sub.textContent = p.host || "нет хоста";
+ left.appendChild(nameEl);
+ left.appendChild(sub);
+
+ const right = document.createElement("div");
+ right.className = "right";
+ const proto = document.createElement("span");
+ proto.className = "proto";
+ proto.textContent = (p.protocol || "?").toString();
+ const ms = document.createElement("span");
+ const pr = pingMap[p.name];
+ if (pr && pr.ok) {
+ ms.className = "ms " + msClass(pr.ms, true);
+ ms.textContent = pr.ms + " ms";
+ } else if (pr && pr.error) {
+ ms.className = "ms bad";
+ ms.textContent = "—";
+ ms.title = pr.error;
+ } else {
+ ms.className = "ms";
+ ms.textContent = "…";
+ }
+ right.appendChild(proto);
+ right.appendChild(ms);
+
row.appendChild(left);
row.appendChild(right);
- pingList.appendChild(row);
+ row.addEventListener("click", () => onServerClick(p.name));
+ row.addEventListener("dblclick", () => onServerConnect(p.name));
+ serverList.appendChild(row);
});
- if ((pings || []).length && $("toolsBox") && !$("toolsBox").open) {
- $("toolsBox").open = true;
+ }
+
+ async function onServerClick(name) {
+ if (busy) return;
+ if (connected) {
+ if (name !== profile.value) await onServerConnect(name);
+ return;
}
+ await withBusy(async () => {
+ await selectProfile(name);
+ dirty = false;
+ formHydrated = false;
+ });
+ }
+
+ async function onServerConnect(name) {
+ if (busy) return;
+ await withBusy(async () => {
+ setMeta("Подключение к «" + name + "»…");
+ await connectProfile(name);
+ setMeta("Подключено: " + name, "ok");
+ });
}
function renderUpdate(u, version) {
@@ -928,14 +1167,15 @@
saveBtn.disabled = lock;
coreBtn.disabled = busy;
pingBtn.disabled = busy;
+ bestBtn.disabled = busy;
updCheckBtn.disabled = busy;
updateBtn.disabled = busy;
subBtn.disabled = busy;
subUrl.disabled = busy;
btn.disabled = busy;
+ rememberPings(state.pings || []);
fillProfiles(state.profiles || [], state.active_profile || state.profile);
- renderPings(state.pings || []);
renderUpdate(state.update, state.version);
if (typeof state.subscription_url === "string" && !dirty) {
subUrl.value = state.subscription_url;
@@ -969,8 +1209,9 @@
detail = "Сначала установите cores в разделе «Сервис»";
heroHint.textContent = "Нужны cores для выбранного протокола";
} else {
- detail = "Готово к подключению";
- heroHint.textContent = "Выберите профиль и нажмите Подключить";
+ const n = (state.profiles || []).length;
+ detail = n > 1 ? ("Серверов: " + n + " · нажмите Пинг или Лучший") : "Готово к подключению";
+ heroHint.textContent = n > 1 ? "Клик — выбрать, двойной клик — подключить" : "Выберите сервер и нажмите Подключить";
}
if (!busy && Date.now() > metaHoldUntil) {
setMeta(detail, state.core_ready === false ? "err" : "");
@@ -1002,11 +1243,22 @@
}
function paintButtonsLocked(locked) {
- [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, updCheckBtn, updateBtn, subBtn, subUrl].forEach((b) => {
+ [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, bestBtn, updCheckBtn, updateBtn, subBtn, subUrl].forEach((b) => {
if (b) b.disabled = locked;
});
}
+ async function runBest(autoConnect) {
+ setMeta(autoConnect ? "Пинг и автоподключение…" : "Пинг и выбор лучшего…");
+ const res = await pingBest(!!autoConnect);
+ rememberPings(res.pings || []);
+ renderServerList(res.best_name || profile.value);
+ if (res.best_name) {
+ setMeta("Лучший: " + res.best_name + " · " + res.best_ms + " ms" + (res.connected ? " · подключено" : ""), "ok");
+ }
+ return res;
+ }
+
profile.addEventListener("change", () => withBusy(async () => {
await selectProfile(profile.value);
dirty = false;
@@ -1104,7 +1356,8 @@
const n = await importSubscription(url);
formHydrated = false;
dirty = false;
- setMeta("Импортировано профилей: " + n, "ok");
+ setMeta("Импортировано: " + n + " · измеряю пинг…", "ok");
+ await runBest(!!autoBest.checked);
}
subBtn.addEventListener("click", () => withBusy(async () => {
@@ -1121,14 +1374,21 @@
pingBtn.addEventListener("click", () => withBusy(async () => {
try {
- setMeta("Проверка серверов…");
+ setMeta("Пинг серверов…");
const rows = await pingServers();
- renderPings(rows);
+ rememberPings(rows);
+ renderServerList(profile.value);
const ok = (rows || []).filter((r) => r.ok).length;
setMeta("Пинг: " + ok + "/" + (rows || []).length + " доступны", ok ? "ok" : "err");
} catch (e) { setMeta(String(e), "err"); }
}));
+ bestBtn.addEventListener("click", () => withBusy(async () => {
+ try {
+ await runBest(!!autoBest.checked);
+ } catch (e) { setMeta(String(e), "err"); }
+ }));
+
updCheckBtn.addEventListener("click", () => withBusy(async () => {
try {
setMeta("Проверка обновлений…");
@@ -1148,7 +1408,16 @@
} catch (e) { setMeta(String(e), "err"); }
}));
- refresh({ syncForm: true }).catch((e) => setMeta(String(e), "err"));
+ (async () => {
+ try {
+ await refresh({ syncForm: true });
+ if (profiles.length > 1 && autoBest.checked && !connected) {
+ await withBusy(async () => { await runBest(true); });
+ }
+ } catch (e) {
+ setMeta(String(e), "err");
+ }
+ })();
setInterval(() => { if (!busy && !modal.classList.contains("open")) refresh().catch(() => {}); }, 2500);