chore: bump release to v114
This commit is contained in:
1 parent
d54d551cd5
commit
84f4d43486
22 files changed
+693
-99
No files matched your search
@@ -795,6 +795,26 @@ heartbeat_candidate_endpoints() {
|
||||
esac
|
||||
}
|
||||
|
||||
heartbeat_set_url_if_changed() {
|
||||
local key next current ignored_file ignored
|
||||
key="$1"
|
||||
next="$2"
|
||||
case "$next" in http://?*|https://?*) ;; *) return 1 ;; esac
|
||||
current="$(uci_get "$key" '')"
|
||||
case "$current|$next" in
|
||||
https://*'|'http://*)
|
||||
ignored_file="${TMPDIR:-/tmp}/owrt-remote-$key-ignored"
|
||||
ignored="$current|$next"
|
||||
if [ "$(cat "$ignored_file" 2>/dev/null)" != "$ignored" ]; then
|
||||
log "heartbeat kept $key: current=$current proposed=$next reason=https-downgrade"
|
||||
printf '%s' "$ignored" >"$ignored_file"
|
||||
fi
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
uci_set_if_changed "$key" "$next"
|
||||
}
|
||||
|
||||
heartbeat_apply_hub_update() {
|
||||
local response_file fallback_base next_hub_url next_public_url next_vps_host changed old_vps_host mode ignored_file ignored
|
||||
response_file="$1"
|
||||
@@ -804,12 +824,15 @@ heartbeat_apply_hub_update() {
|
||||
next_vps_host="$(json_extract_object_string "$response_file" hub_update vps_host)"
|
||||
old_vps_host="$(uci_get vps_host '')"
|
||||
mode="$(vps_host_mode)"
|
||||
[ -n "$next_hub_url" ] || next_hub_url="$fallback_base"
|
||||
# A fallback is a temporary transport, not a new configured Hub URL.
|
||||
if [ -z "$next_hub_url" ] && [ -z "$(uci_get hub_url '')" ]; then
|
||||
next_hub_url="$fallback_base"
|
||||
fi
|
||||
changed=0
|
||||
if uci_set_if_changed hub_url "$next_hub_url"; then
|
||||
if heartbeat_set_url_if_changed hub_url "$next_hub_url"; then
|
||||
changed=1
|
||||
fi
|
||||
if uci_set_if_changed public_url "$next_public_url"; then
|
||||
if heartbeat_set_url_if_changed public_url "$next_public_url"; then
|
||||
changed=1
|
||||
fi
|
||||
if [ "$mode" = auto ]; then
|
||||
|
||||
@@ -387,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 v113</title>
|
||||
<title>OpenWrt Remote Hub v114</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}
|
||||
@@ -418,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">v113</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v114</span></span></h1>
|
||||
</div>
|
||||
<div class="links">
|
||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||
@@ -517,7 +517,7 @@ EOF
|
||||
field vps_host "VPS host" text "IP или домен VPS, куда Xray роутера подключается reverse-туннелем. Бери IP/домен своего VPS."
|
||||
cat <<EOF
|
||||
<label class="check"><input type="checkbox" name="vps_host_auto" value="1" $vps_host_auto_checked> Автоматически обновлять VPS host</label>
|
||||
<span class="hint">Выключено: заданный VPS host сохраняется, heartbeat не меняет его.</span>
|
||||
<span class="hint">Управляет только адресом Xray: выключено — VPS host сохраняется; включено — Hub может изменить его и перезапустить Xray. Hub URL настраивается отдельно.</span>
|
||||
<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
|
||||
|
||||
@@ -14,7 +14,7 @@ return view.extend({
|
||||
|
||||
if (!key) {
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v113')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v114')),
|
||||
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 v113')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v114')),
|
||||
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