Add multi-WAN failover and release v112
This commit is contained in:
1 parent
50a18ae33c
commit
bcbcb071cc
23 files changed
+910
-76
No files matched your search
@@ -8,7 +8,7 @@ LAST_RESTART_FILE="$STATE_DIR/last-restart"
|
||||
QUIET_SECONDS=18
|
||||
RESTART_COOLDOWN=45
|
||||
|
||||
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || [ "$ACTION" = "ifrestart" ] || exit 0
|
||||
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || [ "$ACTION" = "ifrestart" ] || [ "$ACTION" = "ifdown" ] || exit 0
|
||||
|
||||
case "$(uci -q get owrtremote.main.enabled 2>/dev/null || echo 0)" in
|
||||
1|yes|true|on|enabled) ;;
|
||||
@@ -26,10 +26,18 @@ if [ -n "$INTERFACE" ] && command -v ubus >/dev/null 2>&1; then
|
||||
)"
|
||||
fi
|
||||
|
||||
case "$INTERFACE:$DEVICE:$proto" in
|
||||
wan:*:*|wan6:*:*|*:pppoe*:*|*:ppp*:*|*:*:pppoe|*:*:ppp) ;;
|
||||
*) exit 0 ;;
|
||||
esac
|
||||
direct_wan="$(uci -q get owrtremote.main.wan_direct 2>/dev/null || echo 0)"
|
||||
if [ "$direct_wan" = 1 ]; then
|
||||
selected_wans="$(uci -q get owrtremote.main.wan_interface 2>/dev/null || echo wan)"
|
||||
[ -n "$selected_wans" ] || selected_wans=wan
|
||||
case " $selected_wans " in *" $INTERFACE "*) ;; *) exit 0 ;; esac
|
||||
else
|
||||
[ "$ACTION" != ifdown ] || exit 0
|
||||
case "$INTERFACE:$DEVICE:$proto" in
|
||||
wan:*:*|wan6:*:*|*:pppoe*:*|*:ppp*:*|*:*:pppoe|*:*:ppp) ;;
|
||||
*) exit 0 ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
network_ready() {
|
||||
if command -v ip >/dev/null 2>&1 && ip route get 1.1.1.1 >/dev/null 2>&1; then
|
||||
@@ -96,6 +104,13 @@ printf '%s\n' "$stamp" >"$STAMP_FILE"
|
||||
sleep 2
|
||||
[ "$(cat "$STAMP_FILE" 2>/dev/null)" = "$stamp" ] || exit 0
|
||||
|
||||
if [ "$direct_wan" = 1 ]; then
|
||||
# Heartbeat prepares the selected uplink and reconnects Xray only if its
|
||||
# binding changed. A restored primary must not interrupt a healthy backup.
|
||||
/usr/sbin/owrt-remote heartbeat wan-reconnect >/dev/null 2>&1 || true
|
||||
exit 0
|
||||
fi
|
||||
|
||||
now="$(safe_num "$(date +%s 2>/dev/null || echo 0)" 0)"
|
||||
last_restart="$(safe_num "$(cat "$LAST_RESTART_FILE" 2>/dev/null)" 0)"
|
||||
if [ "$now" -gt 0 ] && [ $((now - last_restart)) -lt "$RESTART_COOLDOWN" ]; then
|
||||
|
||||
@@ -40,20 +40,62 @@ wan_url_port() {
|
||||
printf '%s' "$port"
|
||||
}
|
||||
|
||||
wan_device() {
|
||||
wan_interfaces() {
|
||||
printf '%s\n' "${OWRT_REMOTE_WAN_INTERFACE:-$(uci_get wan_interface wan)}" | awk '
|
||||
{ for (i=1; i<=NF; i++) {
|
||||
if ($i !~ /^[a-zA-Z0-9_.:-]+$/) exit 1
|
||||
if (!seen[$i]++) { printf "%s%s", sep, $i; sep=" " }
|
||||
} }
|
||||
'
|
||||
}
|
||||
|
||||
wan_interface_device() {
|
||||
local iface device
|
||||
iface="${OWRT_REMOTE_WAN_INTERFACE:-$(uci_get wan_interface wan)}"
|
||||
iface="$1"
|
||||
device="$(ubus call "network.interface.$iface" status 2>/dev/null | jsonfilter -e '@.l3_device' 2>/dev/null)"
|
||||
[ -n "$device" ] || return 1
|
||||
case "$device" in *[!a-zA-Z0-9_.:-]*) return 1 ;; esac
|
||||
case "$device" in tun*|sing*|podkop*|lo) return 1 ;; esac
|
||||
printf '%s' "$device"
|
||||
}
|
||||
|
||||
wan_interface_ready() {
|
||||
local device
|
||||
device="$(wan_interface_device "$1")" || return 1
|
||||
ip -4 route show table main default dev "$device" | grep -q '^default'
|
||||
}
|
||||
|
||||
wan_select_interface() {
|
||||
local interfaces current iface
|
||||
interfaces="$(wan_interfaces)" || return 1
|
||||
current="$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
|
||||
# Keep a working uplink rather than interrupting it when a primary returns.
|
||||
if [ -n "$current" ]; then
|
||||
case " $interfaces " in *" $current "*)
|
||||
if wan_interface_ready "$current"; then printf '%s' "$current"; return; fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
for iface in $interfaces; do
|
||||
if wan_interface_ready "$iface"; then printf '%s' "$iface"; return; fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
wan_device() {
|
||||
local iface
|
||||
iface="${OWRT_REMOTE_ACTIVE_WAN_INTERFACE:-}"
|
||||
[ -n "$iface" ] || iface="$(wan_select_interface)" || return 1
|
||||
wan_interface_device "$iface"
|
||||
}
|
||||
|
||||
wan_dns_server() {
|
||||
local dns
|
||||
local dns iface
|
||||
dns="$(uci_get wan_dns '')"
|
||||
if [ -z "$dns" ]; then
|
||||
dns="$(ubus call "network.interface.$(uci_get wan_interface wan)" status 2>/dev/null | jsonfilter -e '@["dns-server"][0]' 2>/dev/null)"
|
||||
iface="${OWRT_REMOTE_ACTIVE_WAN_INTERFACE:-}"
|
||||
[ -n "$iface" ] || iface="$(wan_select_interface)" || return 1
|
||||
dns="$(ubus call "network.interface.$iface" status 2>/dev/null | jsonfilter -e '@["dns-server"][0]' 2>/dev/null)"
|
||||
fi
|
||||
[ -n "$dns" ] || dns=1.1.1.1
|
||||
wan_ip_literal "$dns" || return 1
|
||||
@@ -232,7 +274,7 @@ wan_preflight() {
|
||||
for tool in ip nft ubus jsonfilter curl nslookup; do
|
||||
command -v "$tool" >/dev/null 2>&1 || { log "WAN direct requires $tool"; return 1; }
|
||||
done
|
||||
device="$(wan_device)" || { log "WAN interface is not ready: $(uci_get wan_interface wan)"; return 1; }
|
||||
device="$(wan_device)" || { log "No selected WAN interface is ready: $(uci_get wan_interface wan)"; return 1; }
|
||||
case "$device" in tun*|sing*|podkop*) log "WAN direct cannot use a proxy/TUN device: $device"; return 1 ;; esac
|
||||
ip -4 route show table main default dev "$device" | grep -q '^default' || {
|
||||
log "WAN has no IPv4 default route on $device"; return 1
|
||||
@@ -243,7 +285,8 @@ wan_preflight() {
|
||||
}
|
||||
|
||||
wan_prepare_locked() {
|
||||
local device dns gateway family host ip url port
|
||||
local device dns gateway family host ip url port previous OWRT_REMOTE_ACTIVE_WAN_INTERFACE
|
||||
OWRT_REMOTE_ACTIVE_WAN_INTERFACE="$(wan_select_interface)" || { log 'No selected WAN has a physical IPv4 default route'; return 1; }
|
||||
wan_preflight || return 1
|
||||
device="$(wan_device)" || return 1
|
||||
dns="$(wan_dns_server)" || return 1
|
||||
@@ -288,6 +331,12 @@ wan_prepare_locked() {
|
||||
mv "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/endpoints.new.$$"
|
||||
wan_apply_destination_rules "$dns" "$WAN_STATE/endpoints.new.$$" || return 1
|
||||
mv "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints"
|
||||
previous="$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
|
||||
printf '%s\n' "$OWRT_REMOTE_ACTIVE_WAN_INTERFACE" >"$WAN_STATE/active-interface.new.$$"
|
||||
mv "$WAN_STATE/active-interface.new.$$" "$WAN_STATE/active-interface"
|
||||
if [ -n "$previous" ] && [ "$previous" != "$OWRT_REMOTE_ACTIVE_WAN_INTERFACE" ]; then
|
||||
log "WAN failover: $previous -> $OWRT_REMOTE_ACTIVE_WAN_INTERFACE"
|
||||
fi
|
||||
}
|
||||
|
||||
wan_prepare() (
|
||||
@@ -307,14 +356,19 @@ wan_prepare() (
|
||||
sleep 1
|
||||
done
|
||||
printf '%s' "$$" >"$WAN_STATE/lock/pid"
|
||||
trap 'rm -f "$WAN_STATE/lock/pid" "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/targets.new.$$" "$WAN_STATE/target-keys.$$"; rmdir "$WAN_STATE/lock" 2>/dev/null || true' EXIT
|
||||
trap 'rm -f "$WAN_STATE/lock/pid" "$WAN_STATE/endpoints.new.$$" "$WAN_STATE/endpoints.dedup.$$" "$WAN_STATE/targets.new.$$" "$WAN_STATE/target-keys.$$" "$WAN_STATE/active-interface.new.$$"; rmdir "$WAN_STATE/lock" 2>/dev/null || true' EXIT
|
||||
trap 'exit 1' INT TERM
|
||||
wan_prepare_locked
|
||||
)
|
||||
|
||||
wan_post_json() {
|
||||
local url token file host port ip device
|
||||
local url token file host port ip device selected OWRT_REMOTE_ACTIVE_WAN_INTERFACE
|
||||
url="$1"; token="$2"; file="$3"
|
||||
selected="$(wan_select_interface)" || return 1
|
||||
if [ "$selected" != "$(cat "$WAN_STATE/active-interface" 2>/dev/null)" ]; then
|
||||
wan_prepare || return 1
|
||||
fi
|
||||
OWRT_REMOTE_ACTIVE_WAN_INTERFACE="$(cat "$WAN_STATE/active-interface")" || return 1
|
||||
host="$(wan_url_host "$url")"
|
||||
port="$(wan_url_port "$url")" || return 1
|
||||
ip="$(wan_endpoint_ip "$url")" || return 1
|
||||
@@ -347,13 +401,14 @@ wan_cleanup() {
|
||||
rm -f "$WAN_STATE/route-owner-$family"
|
||||
done
|
||||
# Only volatile resolver cache owned by this module.
|
||||
rm -f "$WAN_STATE"/resolve-* "$WAN_STATE/endpoints" "$WAN_STATE/targets"
|
||||
rm -f "$WAN_STATE"/resolve-* "$WAN_STATE/endpoints" "$WAN_STATE/targets" "$WAN_STATE/active-interface"
|
||||
rm -f "$WAN_STATE/lock/pid"
|
||||
rmdir "$WAN_STATE/lock" "$WAN_STATE" 2>/dev/null || true
|
||||
}
|
||||
|
||||
wan_diagnostics() {
|
||||
printf 'vps_host=%s mode=%s WAN_direct=%s\n' "$(uci_get vps_host '')" "$(vps_host_mode)" "$(uci_get wan_direct 0)"
|
||||
printf 'WAN_selected=%s WAN_active=%s\n' "$(wan_interfaces)" "$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
|
||||
printf 'WAN_device=%s WAN_DNS=%s\n' "$(wan_device)" "$(wan_dns_server)"
|
||||
printf 'System DNS (compare with WAN DNS):\n'
|
||||
nslookup -timeout=3 -retry=1 "$(wan_url_host "$(uci_get hub_url '')")" 2>&1 || true
|
||||
|
||||
@@ -523,13 +523,14 @@ render_client_config() {
|
||||
|
||||
router_id="$(safe_id "$(uci_get router_id main)")"
|
||||
vps_host="$(uci_get vps_host '')"
|
||||
local wan_sockopt
|
||||
local wan_sockopt wan_xray_device
|
||||
wan_sockopt=''
|
||||
if truthy "$(uci_get wan_direct 0)"; then
|
||||
command -v wan_prepare >/dev/null 2>&1 || die "WAN helper missing: $WAN_HELPER"
|
||||
wan_prepare || die "не удалось подготовить прямое соединение через WAN"
|
||||
vps_host="$(wan_resolve_host "$vps_host")" || die "VPS host не разрешается через WAN DNS"
|
||||
wan_sockopt=", \"sockopt\": {\"mark\": $((PODKOP_BYPASS_MARK)), \"interface\": \"$(json_escape "$(wan_device)")\"}"
|
||||
wan_xray_device="$(wan_device)" || die "выбранный WAN интерфейс отключился"
|
||||
wan_sockopt=", \"sockopt\": {\"mark\": $((PODKOP_BYPASS_MARK)), \"interface\": \"$(json_escape "$wan_xray_device")\"}"
|
||||
fi
|
||||
vps_port="$(safe_num "$(uci_get vps_port 8443)" 8443)"
|
||||
uuid="$(uci_get vless_uuid '')"
|
||||
@@ -839,6 +840,7 @@ send_heartbeat() {
|
||||
if truthy "$(uci_get wan_direct 0)"; then
|
||||
command -v wan_prepare >/dev/null 2>&1 || die "WAN helper missing: $WAN_HELPER"
|
||||
wan_prepare || return 1
|
||||
wan_reconcile_xray
|
||||
fi
|
||||
|
||||
endpoint="${hub_url%/}/api/heartbeat"
|
||||
@@ -864,6 +866,39 @@ send_heartbeat() {
|
||||
return 1
|
||||
}
|
||||
|
||||
wan_reconcile_xray() {
|
||||
local config bound device
|
||||
config="$(uci_get xray_config /etc/xray/owrt-remote-client.json)"
|
||||
[ -r "$config" ] || return 0
|
||||
bound="$(jsonfilter -i "$config" -e '@.outbounds[@.tag="vps-interconn"].streamSettings.sockopt.interface' 2>/dev/null)"
|
||||
device="$(wan_device)" || return 1
|
||||
[ "$bound" != "$device" ] || return 0
|
||||
xray_running || return 0
|
||||
wan_reconnect_xray "$bound" "$device"
|
||||
}
|
||||
|
||||
wan_reconnect_xray() {
|
||||
local restart_lock owner
|
||||
restart_lock="${TMPDIR:-/tmp}/owrt-remote-wan-restart"
|
||||
# A concurrent heartbeat must not enqueue another restart of the same tunnel.
|
||||
if ! mkdir "$restart_lock" 2>/dev/null; then
|
||||
owner="$(cat "$restart_lock/pid" 2>/dev/null)"
|
||||
case "$owner" in ''|*[!0-9]*) return 0 ;; esac
|
||||
kill -0 "$owner" 2>/dev/null && return 0
|
||||
rm -f "$restart_lock/pid"
|
||||
rmdir "$restart_lock" 2>/dev/null || return 0
|
||||
mkdir "$restart_lock" 2>/dev/null || return 0
|
||||
fi
|
||||
log "Reconnecting reverse tunnel after WAN change: $1 -> $2"
|
||||
(
|
||||
trap 'rm -f "$restart_lock/pid"; rmdir "$restart_lock" 2>/dev/null || true' EXIT
|
||||
trap 'exit 1' INT TERM
|
||||
sleep 1
|
||||
/etc/init.d/owrt-remote restart >/dev/null 2>&1 || log 'WAN failover tunnel restart failed'
|
||||
) </dev/null >/dev/null 2>&1 &
|
||||
printf '%s' "$!" >"$restart_lock/pid"
|
||||
}
|
||||
|
||||
heartbeat_mark_ok() {
|
||||
rm -f "${TMPDIR:-/tmp}/owrt-remote-heartbeat.fail"
|
||||
}
|
||||
@@ -923,6 +958,8 @@ status() {
|
||||
printf 'vps_host: %s\n' "$(uci_get vps_host '')"
|
||||
printf 'vps_host_mode: %s\n' "$(vps_host_mode)"
|
||||
printf 'wan_direct: %s\n' "$(uci_get wan_direct 0)"
|
||||
printf 'wan_interfaces: %s\n' "$(uci_get wan_interface wan)"
|
||||
printf 'wan_active_interface: %s\n' "$(cat "$WAN_STATE/active-interface" 2>/dev/null)"
|
||||
printf 'vps_port: %s\n' "$(uci_get vps_port 8443)"
|
||||
printf 'xray_bin: %s\n' "$(xray_bin_path)"
|
||||
printf 'xray_config: %s\n' "$(uci_get xray_config /etc/xray/owrt-remote-client.json)"
|
||||
|
||||
@@ -50,6 +50,14 @@ param() {
|
||||
url_decode "$raw"
|
||||
}
|
||||
|
||||
param_values() {
|
||||
local raw
|
||||
awk -F '\t' -v k="$1" '$1 == k { print $2 }' "$PARAMS_FILE" | while IFS= read -r raw; do
|
||||
url_decode "$raw"
|
||||
printf '\n'
|
||||
done
|
||||
}
|
||||
|
||||
has_param() {
|
||||
awk -F ' ' -v k="$1" '$1 == k { found = 1 } END { exit(found ? 0 : 1) }' "$PARAMS_FILE"
|
||||
}
|
||||
@@ -125,7 +133,18 @@ set_result() {
|
||||
}
|
||||
|
||||
save_config() {
|
||||
local enabled field
|
||||
local enabled field wan_interfaces
|
||||
wan_interfaces="$(param_values wan_interface | awk 'NF { if (NF != 1 || $0 !~ /^[a-zA-Z0-9_.:-]+$/) exit 1; if (!seen[$0]++) { printf "%s%s", sep, $0; sep=" " } }')" || {
|
||||
set_result "Настройки не сохранены" "Некорректное имя WAN интерфейса." "bad"
|
||||
return 1
|
||||
}
|
||||
if [ -z "$wan_interfaces" ]; then
|
||||
if has_param wan_interface_picker && has_param wan_direct; then
|
||||
set_result "Настройки не сохранены" "Для прямого соединения с Hub отметь хотя бы один WAN интерфейс." "warn"
|
||||
return 1
|
||||
fi
|
||||
wan_interfaces=wan
|
||||
fi
|
||||
if has_param enabled; then
|
||||
enabled="1"
|
||||
else
|
||||
@@ -138,7 +157,7 @@ save_config() {
|
||||
done
|
||||
if has_param vps_host_auto; then uci_set vps_host_mode auto; else uci_set vps_host_mode manual; fi
|
||||
if has_param wan_direct; then uci_set wan_direct 1; else uci_set wan_direct 0; fi
|
||||
uci_set wan_interface "$(param wan_interface)"
|
||||
uci_set wan_interface "$wan_interfaces"
|
||||
uci_set wan_dns "$(param wan_dns)"
|
||||
uci commit owrtremote
|
||||
set_result "Настройки сохранены" "Если менял Xray или VPS-поля, перезапусти сервис." "ok"
|
||||
@@ -271,6 +290,38 @@ field() {
|
||||
printf '</label>'
|
||||
}
|
||||
|
||||
wan_interface_field() {
|
||||
local current interfaces iface selected count
|
||||
current="$(uci_get wan_interface wan)"
|
||||
# netifd uses logical interface names, not physical devices such as eth0.
|
||||
# Include configured interfaces even while their modem/link is down.
|
||||
interfaces="$(
|
||||
{
|
||||
uci -q show network 2>/dev/null | sed -n 's/^network\.\([^.=]*\)=interface$/\1/p'
|
||||
ubus call network.interface dump 2>/dev/null | jsonfilter -e '@.interface[*].interface' 2>/dev/null
|
||||
} | LC_ALL=C sort -u | while IFS= read -r iface; do
|
||||
case "$iface" in ''|*[!a-zA-Z0-9_.:-]*) continue ;; esac
|
||||
printf '%s\n' "$iface"
|
||||
done
|
||||
)"
|
||||
count="$(printf '%s\n' "$current" | awk '{ print NF }')"
|
||||
printf '<div class="field wanField"><span>WAN интерфейс</span>'
|
||||
printf '<small>Отметь один или несколько интерфейсов с выходом в Интернет. Remote использует один доступный из выбранных; остальные служат резервом. После выбора нажми «Сохранить и запустить».</small>'
|
||||
printf '<input type="hidden" name="wan_interface_picker" value="1">'
|
||||
printf '<details class="wanPicker" data-wan-picker><summary>Выбрать интерфейсы (<b data-wan-count>%s</b>)</summary><div class="wanPickerList">' "$count"
|
||||
# Keep saved choices even while netifd/UCI cannot list those interfaces.
|
||||
{
|
||||
printf '%s\n' "$current" | tr ' ' '\n'
|
||||
printf '%s\n' "$interfaces"
|
||||
} | awk 'NF && !seen[$0]++' | while IFS= read -r iface; do
|
||||
[ -n "$iface" ] || continue
|
||||
selected=''
|
||||
case " $current " in *" $iface "*) selected=' checked' ;; esac
|
||||
printf '<label class="wanChoice"><input type="checkbox" name="wan_interface" value="%s"%s>%s</label>' "$(h "$iface")" "$selected" "$(h "$iface")"
|
||||
done
|
||||
printf '</div></details><div class="wanPicked" data-wan-picked>%s</div></div>' "$(h "$current")"
|
||||
}
|
||||
|
||||
metric() {
|
||||
local label value tone
|
||||
label="$1"
|
||||
@@ -336,7 +387,7 @@ render_page() {
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="owrt-remote-ui-version" content="$OWRT_REMOTE_UI_VERSION">
|
||||
<title>OpenWrt Remote Hub v111</title>
|
||||
<title>OpenWrt Remote Hub v112</title>
|
||||
<style>
|
||||
:root{color-scheme:dark;--bg:#07040f;--panel:rgba(19,14,32,.88);--text:#f7f2ff;--muted:#b9adc9;--line:rgba(169,126,255,.24);--blue:#7c3aed;--green:#22c55e;--red:#fb7185;--amber:#f59e0b;--teal:#a855f7;--grid:rgba(168,85,247,.16)}
|
||||
*{box-sizing:border-box}body{position:relative;min-height:100vh;margin:0;overflow-x:hidden;background-color:var(--bg);background-image:radial-gradient(circle at 12% 8%,rgba(168,85,247,.46),transparent 31%),radial-gradient(circle at 82% 12%,rgba(79,70,229,.38),transparent 30%),radial-gradient(circle at 50% 105%,rgba(236,72,153,.26),transparent 35%),linear-gradient(145deg,#07040f,#120a24 48%,#05030a),repeating-linear-gradient(0deg,transparent 0 30px,var(--grid) 31px),repeating-linear-gradient(90deg,transparent 0 30px,var(--grid) 31px);background-size:130% 130%,140% 140%,135% 135%,100% 100%,31px 31px,31px 31px;background-attachment:fixed;color:var(--text);font:14px/1.45 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;animation:bgFlow 22s ease-in-out infinite alternate}
|
||||
@@ -350,12 +401,13 @@ h1{margin:0;font-size:28px;line-height:1.2;letter-spacing:0}.appBanner{position:
|
||||
.pill{min-width:118px;background:var(--panel);color:var(--muted)}.dot{width:9px;height:9px;border-radius:50%;background:var(--amber)}.dot.good{background:var(--green)}.dot.bad{background:var(--red)}
|
||||
.grid{display:grid;grid-template-columns:1fr;gap:16px;margin-top:18px}.panel{min-width:0;background:var(--panel);border:1px solid var(--line);border-radius:8px;padding:16px;box-shadow:0 18px 46px rgba(0,0,0,.28);backdrop-filter:blur(10px)}
|
||||
.panel h2{font-size:18px;margin:0 0 12px}.panelHead{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.panelHead h2{margin:0}.headActionForm{margin:0}.clearBtn{border-color:rgba(251,113,133,.34);background:linear-gradient(135deg,rgba(251,113,133,.18),rgba(124,58,237,.22));color:#fecdd3;box-shadow:0 12px 28px rgba(251,113,133,.10)}.metrics{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}.metric{min-width:0;border:1px solid var(--line);border-radius:8px;padding:12px;background:rgba(255,255,255,.06);text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center}.metric span{display:block;color:var(--muted);font-size:12px}.metric strong{display:block;margin-top:4px;font-size:18px;overflow-wrap:anywhere;word-break:break-word}.metric.good strong{color:var(--green)}.metric.bad strong{color:var(--red)}.metric.warn strong{color:var(--amber)}.linkMetric{grid-column:span 2}.metricLine{display:inline-flex;align-items:center;justify-content:center;flex-wrap:wrap;gap:8px;max-width:100%}.metricLine strong{min-width:0}.miniGo{border:1px solid rgba(34,211,238,.34);border-radius:999px;padding:7px 10px;background:rgba(34,211,238,.13);color:#a5f3fc;text-decoration:none;font-weight:850;white-space:nowrap}
|
||||
form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px}.field{position:relative;display:block}.field span{display:flex;align-items:center;gap:7px;font-weight:650;margin-bottom:7px}.field span::after{content:"?";width:18px;height:18px;border-radius:50%;display:inline-grid;place-items:center;background:rgba(116,94,148,.24);border:1px solid rgba(169,126,255,.24);color:#c4b5fd;font-size:12px;font-weight:900}.field input{width:100%;border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72);padding:10px 11px;color:var(--text)}.field small{position:absolute;left:0;right:0;bottom:calc(100% + 8px);z-index:20;display:block;visibility:hidden;opacity:0;transform:translateY(6px);padding:10px 12px;border:1px solid rgba(169,126,255,.22);border-radius:8px;background:rgba(10,6,18,.97);box-shadow:0 18px 42px rgba(0,0,0,.42);color:#ddd6fe;transition:opacity .16s ease,transform .16s ease,visibility .16s ease;pointer-events:none}.field:hover small,.field:focus-within small{visibility:visible;opacity:1;transform:translateY(0)}
|
||||
form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px}.field{position:relative;display:block}.field span{display:flex;align-items:center;gap:7px;font-weight:650;margin-bottom:7px}.field span::after{content:"?";width:18px;height:18px;border-radius:50%;display:inline-grid;place-items:center;background:rgba(116,94,148,.24);border:1px solid rgba(169,126,255,.24);color:#c4b5fd;font-size:12px;font-weight:900}.field input,.field select{width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72);padding:10px 11px;color:var(--text)}.field select{font:inherit;cursor:pointer}.field small{position:absolute;left:0;right:0;bottom:calc(100% + 8px);z-index:20;display:block;visibility:hidden;opacity:0;transform:translateY(6px);padding:10px 12px;border:1px solid rgba(169,126,255,.22);border-radius:8px;background:rgba(10,6,18,.97);box-shadow:0 18px 42px rgba(0,0,0,.42);color:#ddd6fe;transition:opacity .16s ease,transform .16s ease,visibility .16s ease;pointer-events:none}.field:hover small,.field:focus-within small{visibility:visible;opacity:1;transform:translateY(0)}
|
||||
.check{display:flex;gap:10px;align-items:center;margin-bottom:12px;font-weight:700}.check input{width:18px;height:18px}.actions{display:flex;flex-wrap:wrap;gap:10px;margin-top:14px;justify-content:center}.saveActions{justify-content:flex-end}.btn{border:1px solid rgba(255,255,255,.08);border-radius:8px;padding:10px 13px;font-weight:750;cursor:pointer;text-decoration:none;display:inline-flex;align-items:center;justify-content:center;background:rgba(255,255,255,.10);color:#f7f2ff}.btn.primary{background:var(--blue);color:#fff}.btn.good{background:var(--green);color:#07120a}.btn.bad{background:rgba(251,113,133,.18);color:#fecdd3}.btn.warn{background:rgba(245,158,11,.16);color:#fde68a;border:1px solid rgba(245,158,11,.34)}
|
||||
.notice{max-height:280px;overflow:auto;margin-top:16px;border-radius:8px;padding:12px;border:1px solid var(--line);background:rgba(255,255,255,.08);white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}.notice strong{display:block;margin-bottom:4px;font:700 14px/1.4 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.notice.ok{border-color:rgba(34,197,94,.46);background:rgba(34,197,94,.12)}.notice.bad{border-color:rgba(251,113,133,.46);background:rgba(251,113,133,.12)}.notice.warn{border-color:rgba(245,158,11,.46);background:rgba(245,158,11,.12)}
|
||||
.code{background:rgba(255,255,255,.06);border:1px solid var(--line);color:var(--text);border-radius:8px;padding:12px;overflow:auto;overflow-wrap:anywhere;min-height:120px;white-space:pre-wrap;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}
|
||||
.helperText{margin:0 0 12px;color:var(--muted)}.xrayApply{margin-top:14px;padding:16px;border:1px solid rgba(34,211,238,.42);border-radius:8px;background:linear-gradient(135deg,rgba(34,211,238,.16),rgba(124,58,237,.20),rgba(236,72,153,.11));box-shadow:0 18px 42px rgba(34,211,238,.10)}.xrayApply h3{margin:0 0 8px;font-size:16px;color:#a5f3fc}.scriptBox{width:100%;min-height:260px;resize:vertical;border:1px solid rgba(34,211,238,.28);border-radius:8px;background:rgba(255,255,255,.07);padding:12px;color:var(--text);font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre;overflow:auto}
|
||||
.brandPanel{display:grid;grid-template-columns:repeat(2,minmax(0,132px));gap:8px}.brandPanel .titleRow,.brandPanel .links{grid-column:1/-1}.brandPanel .appBanner{width:100%;min-width:0}.brandPanel .links{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:0}.brandPanel .links a{width:100%;min-width:0}
|
||||
.wanPicker{border:1px solid var(--line);border-radius:8px;background:rgba(8,5,18,.72)}.wanPicker summary{display:flex;align-items:center;justify-content:center;gap:5px;min-height:40px;padding:10px 11px;cursor:pointer;list-style:none;font-weight:700}.wanPicker summary::-webkit-details-marker{display:none}.wanPicker summary::after{content:"▾";margin-left:auto;color:var(--muted)}.wanPicker[open] summary::after{content:"▴"}.wanPickerList{display:flex;flex-direction:column;gap:4px;max-height:240px;overflow:auto;padding:6px;border-top:1px solid var(--line)}.wanChoice{display:flex;align-items:center;gap:10px;min-height:40px;padding:8px;border-radius:6px;cursor:pointer;overflow-wrap:anywhere}.wanChoice:hover{background:rgba(255,255,255,.08)}.wanChoice input{width:18px;height:18px;min-width:18px;padding:0;margin:0;accent-color:var(--blue)}.wanPicked{margin-top:6px;font-size:12px;color:var(--muted);overflow-wrap:anywhere}
|
||||
@media(max-width:820px){.grid,.formgrid,.metrics{grid-template-columns:1fr}.linkMetric{grid-column:span 1}.metricLine{align-items:center;justify-content:center}.miniGo{width:auto;justify-content:center;display:inline-flex}.hero{align-items:flex-start;flex-direction:column}.topActions{justify-content:flex-start;padding-top:0}.wrap{padding:14px}h1{font-size:24px}.appBanner{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}.panelHead{align-items:stretch;flex-direction:column}.headActionForm .btn{width:100%}.actions .btn,.actions button{width:100%}}
|
||||
@media(max-width:820px){.brandPanel{grid-template-columns:repeat(2,minmax(0,1fr));width:100%}.brandPanel .appBanner{width:100%}}
|
||||
</style>
|
||||
@@ -366,7 +418,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
||||
<div class="brand">
|
||||
<div class="brandPanel">
|
||||
<div class="titleRow">
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v111</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v112</span></span></h1>
|
||||
</div>
|
||||
<div class="links">
|
||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||
@@ -469,7 +521,7 @@ EOF
|
||||
<label class="check"><input type="checkbox" name="wan_direct" value="1" $wan_direct_checked> Соединение с Hub напрямую через WAN</label>
|
||||
<span class="hint">Heartbeat и Xray обходят Podkop. DNS берётся с WAN, настройки LAN не меняются.</span>
|
||||
EOF
|
||||
field wan_interface "WAN интерфейс" text "Логическое имя WAN из OpenWrt, обычно wan. Пустое поле означает wan."
|
||||
wan_interface_field
|
||||
field wan_dns "WAN DNS" text "Необязательно: IP DNS-сервера для Remote. Пустое поле — DNS от провайдера на WAN."
|
||||
field vps_port "VPS Xray port" number "Порт Xray на VPS для reverse-туннеля. Должен совпадать с render-xray на VPS, обычно 8443."
|
||||
field vless_uuid "VLESS UUID" text "Уникальный UUID роутера. Бери из карточки роутера на VPS или из команды print-openwrt-config."
|
||||
@@ -491,6 +543,19 @@ EOF
|
||||
</form>
|
||||
</section>
|
||||
</main>
|
||||
<script>
|
||||
document.querySelectorAll('[data-wan-picker]').forEach(function(picker) {
|
||||
var field = picker.closest('.wanField');
|
||||
var inputs = Array.from(picker.querySelectorAll('input[name="wan_interface"]'));
|
||||
function updateSelection() {
|
||||
var selected = inputs.filter(function(input) { return input.checked; }).map(function(input) { return input.value; });
|
||||
field.querySelector('[data-wan-count]').textContent = selected.length;
|
||||
field.querySelector('[data-wan-picked]').textContent = selected.length ? selected.join(', ') : 'Интерфейсы не выбраны';
|
||||
}
|
||||
picker.addEventListener('change', updateSelection);
|
||||
updateSelection();
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
EOF
|
||||
@@ -517,8 +582,7 @@ if [ "${REQUEST_METHOD:-GET}" = "POST" ]; then
|
||||
save_config
|
||||
;;
|
||||
save_start)
|
||||
save_config
|
||||
run_action start
|
||||
if save_config; then run_action start; fi
|
||||
;;
|
||||
show_xray_settings)
|
||||
SHOW_XRAY_SETTINGS="1"
|
||||
|
||||
@@ -14,7 +14,7 @@ return view.extend({
|
||||
|
||||
if (!key) {
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v111')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v112')),
|
||||
E('div', { 'class': 'alert-message warning' }, [
|
||||
_('Web key not found. Reinstall the module or create /etc/owrt-remote/web.key.')
|
||||
])
|
||||
@@ -34,7 +34,7 @@ return view.extend({
|
||||
}, 100);
|
||||
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v111')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v112')),
|
||||
E('p', {}, _('Opening remote access panel...')),
|
||||
E('p', {}, [
|
||||
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
|
||||
|
||||
Reference in new issue
Block a user