@@ -4963,16 +5047,16 @@ function render(){
已连接
- ${esc(translateCountry(activeNode.country))} 节点
+ ${declaredFlag ? `${esc(declaredFlag)} ` : ""}${esc(translateCountry(activeNode.country))} 节点
${esc(activeNode.ip || activeNode.remote_host)}:${activeNode.remote_port || ""}
- 物理位置: ${activeFlag ? `${esc(activeFlag)} ` : ""}${esc(displayLocation)}
+ 物理位置: ${locationFlag ? `${esc(locationFlag)} ` : ""}${esc(displayLocation)}
延时: ${latencyText}
运营主体: ${esc(activeNode.owner || activeNode.as_name || "-")}
- IP 类型: ${esc(translateIpType(activeNode.ip_type))}
+ IP 类型: ${esc(translateIpType(activeNode.ip_type))}
@@ -5091,7 +5175,11 @@ function render(){
const badgeText = isCurrentlyActive ? '
已连接' : (isPending ? '
切换中' : translateStatus(n.probe_status));
const latencyText = nodeLatencyHtml(n);
const displayLocation = n.location || translateCountry(n.country) || "-";
- const flag = countryFlag(n.country_short);
+ const flag = countryFlag(n.geo_country_short || n.country_short);
+ const locationTitle = n.location
+ ? `IP 推测位置：${displayLocation}；节点申报国家：${translateCountry(n.country)}`
+ : `节点申报国家：${translateCountry(n.country)}`;
+ const ipTypeTitle = `${translateIpType(n.ip_type)} · 置信度：${translateConfidence(n.ip_type_confidence)} · 来源：${(n.ip_type_sources || []).join(" + ") || "未知"}`;
const isTesting = testingNodeIds.has(n.id) || n.probe_status === "testing";
const testSpinner = `
`;
@@ -5116,9 +5204,9 @@ function render(){
${badgeText} |
${esc(n.ip||n.remote_host)}:${n.remote_port||""} |
${latencyText} |
-
${flag ? `${esc(flag)} ` : ""}${esc(displayLocation)} |
+
${flag ? `${esc(flag)} ` : ""}${esc(displayLocation)} |
${esc(n.owner||n.as_name||"-")} |
-
${esc(translateIpType(n.ip_type))} |
+
${esc(translateIpType(n.ip_type))} |
${testBtn}
@@ -5717,21 +5805,30 @@ function populateRoutingCountries() {
if (!select) return;
const countMap = {};
nodes.forEach(n => {
+ const code = String(n.country_short || "").trim().toUpperCase();
const c = translateCountry(n.country);
- if (c) {
- countMap[c] = (countMap[c] || 0) + 1;
+ if (/^[A-Z]{2}$/.test(code) && c) {
+ const current = countMap[code] || {name: c, count: 0};
+ current.count += 1;
+ countMap[code] = current;
}
});
- const countries = Object.keys(countMap).sort();
+ const countries = Object.keys(countMap).sort((a, b) => countMap[a].name.localeCompare(countMap[b].name, "zh-CN"));
let html = '';
- countries.forEach(c => {
- html += ``;
+ countries.forEach(code => {
+ html += ``;
});
select.innerHTML = html;
if (state) {
- select.value = state.force_country ? translateCountry(state.force_country) : "";
+ const saved = String(state.force_country || "").trim();
+ if (/^[A-Za-z]{2}$/.test(saved)) {
+ select.value = saved.toUpperCase();
+ } else {
+ const legacy = countries.find(code => countMap[code].name === translateCountry(saved));
+ select.value = legacy || "";
+ }
}
}
@@ -6527,9 +6624,11 @@ class Handler(BaseHTTPRequestHandler):
elif effective_path == "/api/nodes":
global last_active_ping_time, last_active_latency, active_openvpn_node_id
nodes = read_nodes()
- active_node = next((n for n in nodes if active_openvpn_node_id and n.get("id") == active_openvpn_node_id), None)
+ connection_state = get_state()
+ connection_ready = connection_ready_for_ui(connection_state)
+ active_node = next((n for n in nodes if connection_ready and n.get("id") == active_openvpn_node_id), None)
for n in nodes:
- n["active"] = (active_openvpn_node_id and n.get("id") == active_openvpn_node_id)
+ n["active"] = bool(connection_ready and n.get("id") == active_openvpn_node_id)
if active_node:
ip = active_node.get("ip") or active_node.get("remote_host")
if ip:
@@ -6787,6 +6886,10 @@ class Handler(BaseHTTPRequestHandler):
expected_port = ui_cfg.get("port", 8787)
expected_suffix = ui_cfg.get("secret_path", "EJsW2EeBo9lY")
+ if ports_conflict(new_port_int, ui_cfg.get("proxy_port", 7928)):
+ self.send_json({"ok": False, "error": "网页管理端口不能与代理出站端口相同"}, HTTPStatus.BAD_REQUEST)
+ return
+
ui_cfg["username"] = new_username
if new_password:
ui_cfg["password"] = new_password
@@ -6823,7 +6926,7 @@ class Handler(BaseHTTPRequestHandler):
new_proxy_port = payload.get("proxy_port")
routing_mode = str(payload.get("routing_mode") or "auto").strip()
- force_country = str(payload.get("force_country") or "").strip()
+ force_country = normalize_routing_country(payload.get("force_country"), read_nodes())
routing_ip_type = str(payload.get("routing_ip_type") or "all").strip()
try:
@@ -6848,7 +6951,7 @@ class Handler(BaseHTTPRequestHandler):
expected_proxy_port = ui_cfg.get("proxy_port", 7928)
fixed_node_id = current_fixed_node_id(ui_cfg) if routing_mode == "fixed_ip" else ""
- if new_proxy_port_int == ui_cfg.get("port", 8787):
+ if ports_conflict(ui_cfg.get("port", 8787), new_proxy_port_int):
self.send_json({"ok": False, "error": "代理出站端口不能与网页管理端口相同"}, HTTPStatus.BAD_REQUEST)
return
if routing_mode == "fixed_ip" and not fixed_node_id:
@@ -6892,7 +6995,7 @@ class Handler(BaseHTTPRequestHandler):
try:
payload = self.read_json_body()
routing_mode = str(payload.get("routing_mode") or "auto").strip()
- force_country = str(payload.get("force_country") or "").strip()
+ force_country = normalize_routing_country(payload.get("force_country"), read_nodes())
routing_ip_type = str(payload.get("routing_ip_type") or "all").strip()
fav_fail_fallback = False
@@ -7126,6 +7229,8 @@ class Handler(BaseHTTPRequestHandler):
if result["ok"]:
set_state(
proxy_ok=True,
+ tunnel_ready=active_openvpn_running(),
+ proxy_ready=active_openvpn_running(),
proxy_ip=result["ip"],
proxy_latency_ms=result["latency_ms"],
proxy_error=""
@@ -7133,6 +7238,7 @@ class Handler(BaseHTTPRequestHandler):
else:
set_state(
proxy_ok=False,
+ proxy_ready=False,
proxy_ip="-",
proxy_latency_ms=0,
proxy_error=result.get("error", "未知错误")
@@ -7187,6 +7293,9 @@ def main() -> None:
"last_fetch_source": "",
"last_check_message": "服务已启动，正在初始化网络并获取候选 VPN 节点...",
"is_connecting": True,
+ "tunnel_ready": False,
+ "proxy_ready": False,
+ "proxy_ok": False,
"pending_node_id": "",
"active_node_latency": "正在准备",
"blacklisted_nodes": 0,
|