chore: bump release to v113
This commit is contained in:
1 parent
bcbcb071cc
commit
d54d551cd5
21 files changed
+310
-66
No files matched your search
@@ -380,8 +380,10 @@ wan_post_json() {
|
||||
grep -Fqx "$ip $port" "$WAN_STATE/endpoints" || return 1
|
||||
fi
|
||||
case "$ip" in *:*) ip="[$ip]" ;; esac
|
||||
# No redirect-following or certificate bypass; Host and SNI remain the URL's.
|
||||
curl -fsS --noproxy '*' --interface "$device" --connect-timeout 4 --max-time 10 \
|
||||
# Follow nginx HTTP-to-HTTPS redirects while preserving this JSON POST.
|
||||
# Host and TLS SNI remain the configured URL's; no certificate bypass is used.
|
||||
curl -fsSL --location --max-redirs 3 --post301 --post302 --post303 \
|
||||
--noproxy '*' --interface "$device" --connect-timeout 4 --max-time 10 \
|
||||
--resolve "$host:$port:$ip" \
|
||||
-H "Authorization: Bearer $token" -H 'Content-Type: application/json' \
|
||||
--data-binary "@$file" "$url"
|
||||
|
||||
@@ -664,13 +664,15 @@ run_xray() {
|
||||
}
|
||||
|
||||
heartbeat_json() {
|
||||
local router_id router_name role public_url hub_url xray_state service_state ssh_state event
|
||||
local router_id router_name role public_url hub_url xray_state service_state ssh_state event heartbeat_interval
|
||||
event="${1:-}"
|
||||
router_id="$(safe_id "$(uci_get router_id main)")"
|
||||
router_name="$(uci_get router_name "$router_id")"
|
||||
role="$(uci_get role node)"
|
||||
public_url="$(uci_get public_url '')"
|
||||
hub_url="$(uci_get hub_url '')"
|
||||
heartbeat_interval="$(safe_num "$(uci_get heartbeat_interval 30)" 30)"
|
||||
[ "$heartbeat_interval" -lt 10 ] && heartbeat_interval=10
|
||||
|
||||
if xray_running; then
|
||||
xray_state="running"
|
||||
@@ -706,6 +708,7 @@ heartbeat_json() {
|
||||
"vps_host": $(json_string "$(uci_get vps_host '')"),
|
||||
"vps_host_mode": $(json_string "$(vps_host_mode)"),
|
||||
"wan_direct": $(json_string "$(uci_get wan_direct 0)"),
|
||||
"heartbeat_interval": $heartbeat_interval,
|
||||
"uptime": $(safe_num "$(uptime_seconds)" 0),
|
||||
"load": $(json_string "$(load_text)"),
|
||||
"memory": $(json_string "$(memory_text)"),
|
||||
@@ -730,7 +733,8 @@ post_json() {
|
||||
fi
|
||||
|
||||
if command -v curl >/dev/null 2>&1; then
|
||||
curl -fsS --connect-timeout 4 --max-time 10 --noproxy '*' \
|
||||
curl -fsSL --location --max-redirs 3 --post301 --post302 --post303 \
|
||||
--connect-timeout 4 --max-time 10 --noproxy '*' \
|
||||
-H "Authorization: Bearer $token" \
|
||||
-H "Content-Type: application/json" \
|
||||
--data-binary "@$file" "$url"
|
||||
@@ -850,7 +854,8 @@ send_heartbeat() {
|
||||
used=0
|
||||
for endpoint in $(heartbeat_candidate_endpoints); do
|
||||
used=1
|
||||
if post_json "$endpoint" "$token" "$tmp" >"$response"; then
|
||||
if post_json "$endpoint" "$token" "$tmp" >"$response" \
|
||||
&& grep -Eq '"ok"[[:space:]]*:[[:space:]]*true' "$response"; then
|
||||
fallback_base="$(heartbeat_base_from_endpoint "$endpoint")"
|
||||
if ! heartbeat_apply_hub_update "$response" "$fallback_base"; then
|
||||
rm -f "$tmp" "$response"
|
||||
|
||||
@@ -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 v112</title>
|
||||
<title>OpenWrt Remote Hub v113</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">v112</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v113</span></span></h1>
|
||||
</div>
|
||||
<div class="links">
|
||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||
|
||||
@@ -14,7 +14,7 @@ return view.extend({
|
||||
|
||||
if (!key) {
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v112')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v113')),
|
||||
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 v112')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v113')),
|
||||
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