diff --git a/files/etc/hotplug.d/iface/99-owrt-remote b/files/etc/hotplug.d/iface/99-owrt-remote index af35314..61fa4bd 100755 --- a/files/etc/hotplug.d/iface/99-owrt-remote +++ b/files/etc/hotplug.d/iface/99-owrt-remote @@ -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 diff --git a/files/usr/lib/owrt-remote/wan.sh b/files/usr/lib/owrt-remote/wan.sh index d10d5c5..1a80e10 100644 --- a/files/usr/lib/owrt-remote/wan.sh +++ b/files/usr/lib/owrt-remote/wan.sh @@ -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 diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 728253a..56f42c9 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -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 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)" diff --git a/files/www/cgi-bin/owrt-remote b/files/www/cgi-bin/owrt-remote index 0907945..d0e8294 100644 --- a/files/www/cgi-bin/owrt-remote +++ b/files/www/cgi-bin/owrt-remote @@ -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 '' } +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 '
WAN интерфейс' + printf 'Отметь один или несколько интерфейсов с выходом в Интернет. Remote использует один доступный из выбранных; остальные служат резервом. После выбора нажми «Сохранить и запустить».' + printf '' + printf '
Выбрать интерфейсы (%s)
' "$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 '' "$(h "$iface")" "$selected" "$(h "$iface")" + done + printf '
%s
' "$(h "$current")" +} + metric() { local label value tone label="$1" @@ -336,7 +387,7 @@ render_page() { -OpenWrt Remote Hub v111 +OpenWrt Remote Hub v112 @@ -366,7 +418,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
-

OpenWrt Remote Hub v111

+

OpenWrt Remote Hub v112

-

OpenWrt Remote Hub v111

+

OpenWrt Remote Hub v112